From d31a2982b3aadef8075c4d91541d5ab6647649a2 Mon Sep 17 00:00:00 2001
From: cnphpbb <moqiruyi@gmail.com>
Date: Fri, 15 Aug 2025 16:08:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(dbSer):=20=E6=9B=B4=E6=96=B0Redis=E5=92=8CM?=
 =?UTF-8?q?ySQL=E9=85=8D=E7=BD=AE=E5=8F=8A=E6=B7=BB=E5=8A=A0=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为Redis添加密码认证并更新MySQL镜像标签和字符集配置
新增webout代理服务配置
---
 dbSer/mysql/prod.stack.yml   |  8 ++++----
 dbSer/redis/env.cfg          |  1 +
 dbSer/redis/valkey.stack.yml |  6 +++---
 webout/myproxy.yml           | 19 +++++++++++++++++++
 4 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 webout/myproxy.yml

diff --git a/dbSer/mysql/prod.stack.yml b/dbSer/mysql/prod.stack.yml
index 5b3ab28..fdfb538 100644
--- a/dbSer/mysql/prod.stack.yml
+++ b/dbSer/mysql/prod.stack.yml
@@ -1,9 +1,9 @@
 # Pull:: docker compose --env-file ./dbSer/mysql/env.cfg -f ./dbSer/mysql/prod.stack.yml pull
-# Run:: docker compose -p dbSer --env-file ./dbSer/mysql/env.cfg -f ./dbSer/mysql/prod.stack.yml up -d
+# Run:: docker compose -p mysql --env-file ./dbSer/mysql/env.cfg -f ./dbSer/mysql/prod.stack.yml up -d
 
 services:
   mysql:
-    image: ${IMAGE_TAG_LTS}
+    image: ${IMAGE_TAG_V9}
     container_name: prod-mysql
     restart: always
     environment:
@@ -15,8 +15,8 @@ services:
       - /etc/localtime:/etc/localtime:ro
     ports:
       - "3306:3306"
-    command:
-    #command: --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci --default-authentication-plugin=mysql_native_password
+    #command:
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci
 
 volumes:
   mysql_data:
diff --git a/dbSer/redis/env.cfg b/dbSer/redis/env.cfg
index 0c4fdc9..678f811 100644
--- a/dbSer/redis/env.cfg
+++ b/dbSer/redis/env.cfg
@@ -4,3 +4,4 @@ IMAGE_TAG_REDISV8=redis:8.0.3-alpine
 IMAGE_TAG_VALKEYV8=valkey/valkey:8.1.3-alpine
 IMAGE_TAG_VALKEYV7=valkey/valkey:7.2.10-alpine
 Volumes_PATH=/data/volumes/redis
+REDIS_PASSWORD=AGC4eGx2aq8rSiZXBP
diff --git a/dbSer/redis/valkey.stack.yml b/dbSer/redis/valkey.stack.yml
index 6b969a2..f06dc53 100644
--- a/dbSer/redis/valkey.stack.yml
+++ b/dbSer/redis/valkey.stack.yml
@@ -1,11 +1,11 @@
-# Pull: docker compose -p valkey --env-file ./base/redis/env.cfg -f ./base/redis/valkey.stack.yml pull
+# Pull: docker compose -p valkey --env-file ./dbSer/redis/env.cfg -f ./dbSer/redis/valkey.stack.yml pull
 
-# Run:: docker compose -p valkey --env-file ./base/redis/env.cfg -f ./base/redis/valkey.stack.yml up -d
+# Run:: docker compose -p valkey --env-file ./dbSer/redis/env.cfg -f ./dbSer/redis/valkey.stack.yml up -d
 services:
   redis:
     image: ${IMAGE_TAG_VALKEYV8}
     ports:
       - '6379:6379'
-    command: valkey-server --appendonly yes
+    command: valkey-server --appendonly yes --requirepass ${REDIS_PASSWORD}
     volumes:
       - '${Volumes_PATH}/redis:/data'
\ No newline at end of file
diff --git a/webout/myproxy.yml b/webout/myproxy.yml
new file mode 100644
index 0000000..fc3cbcd
--- /dev/null
+++ b/webout/myproxy.yml
@@ -0,0 +1,19 @@
+# run:: docker compose -p out-caddy --env-file ./webout/env.cfg -f ./webout/myproxy.yml up -d
+
+services:
+  web-out:
+    image: ${IMAGE_TAG}
+    volumes:
+      - caddy_data:/data
+      - caddy_config:/config
+      - /data/configs/caddy/myproxy.conf:/etc/caddy/Caddyfile
+    ports:
+      - '8080:80'
+    container_name: web-out
+    restart: unless-stopped
+    environment:
+      - TZ=Asia/Shanghai
+
+volumes:
+  caddy_data:
+  caddy_config:
\ No newline at end of file