From 90779e10a8dfec901bd60565cdfd11e8c9dd71fa Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Fri, 15 Aug 2025 14:10:32 +0800 Subject: [PATCH 1/8] gitea env.cfg --- gitea/env.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitea/env.cfg b/gitea/env.cfg index 065a450..09c6bca 100644 --- a/gitea/env.cfg +++ b/gitea/env.cfg @@ -1,4 +1,4 @@ -IMAGE_TAG=gitea/gitea:1.23.8-rootless +IMAGE_TAG=gitea/gitea:1.24.3-rootless Volumes_PATH=/data/volumes/gitea LAY_SSH_HOST_PORT=22 SSH_HOST_PORT=2222 \ No newline at end of file From d50e3d62ae20a004082158afe1ffec88ebe549bd Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Fri, 15 Aug 2025 14:11:48 +0800 Subject: [PATCH 2/8] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20Portainer=20C?= =?UTF-8?q?E=20=E5=92=8C=20Agent=20=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=87=B3=202.32.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portainer-ce/env.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portainer-ce/env.cfg b/portainer-ce/env.cfg index e75c805..43b3ec8 100644 --- a/portainer-ce/env.cfg +++ b/portainer-ce/env.cfg @@ -1,4 +1,4 @@ # IMAGE_LATEST=portainer/portainer-ce:2.19.4 #IMAGE_LATEST=portainer/portainer-ce:latest -IMAGE_TAG=portainer/portainer-ce:2.27.9 -AGENT_TAG=portainer/agent:2.27.9 +IMAGE_TAG=portainer/portainer-ce:2.32.0 +AGENT_TAG=portainer/agent:2.32.0 From eca6eef6ca6f9cbd1827e44a2888445575f8c009 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Fri, 15 Aug 2025 14:27:05 +0800 Subject: [PATCH 3/8] =?UTF-8?q?refactor(db):=20=E9=87=8D=E6=9E=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将redis相关配置文件从base目录移动到dbSer目录 更新mysql和postgres的镜像版本及默认密码 新增redis和valkey的docker-compose配置文件 --- dbSer/mysql/env.cfg | 11 ++++++----- dbSer/postgres/env.cfg | 9 +++++---- {base => dbSer}/redis/env.cfg | 0 {base => dbSer}/redis/redis.stack.yml | 0 {base => dbSer}/redis/valkey.stack.yml | 0 5 files changed, 11 insertions(+), 9 deletions(-) rename {base => dbSer}/redis/env.cfg (100%) rename {base => dbSer}/redis/redis.stack.yml (100%) rename {base => dbSer}/redis/valkey.stack.yml (100%) diff --git a/dbSer/mysql/env.cfg b/dbSer/mysql/env.cfg index 53047d1..b1b4e4d 100644 --- a/dbSer/mysql/env.cfg +++ b/dbSer/mysql/env.cfg @@ -1,5 +1,6 @@ -IMAGE_TAG=mysql:8.4.5 -IMAGE_TAG_V9=mysql:9.3.0 -IMAGE_TAG_V8=mysql:8.0.42 -IMAGE_TAG_LTS=mysql:8.4.5 -MYSQL_ROOT_PASSWORD=Kevin%0412%Mysql \ No newline at end of file +# 密码为生成的密码，请使用时修改后再部署 +IMAGE_TAG=mysql:8.4.6 +IMAGE_TAG_V9=mysql:9.4.0 +IMAGE_TAG_V8=mysql:8.0.43 +IMAGE_TAG_LTS=mysql:8.4.6 +MYSQL_ROOT_PASSWORD=fwoK7vbXMuavrUuX6Q \ No newline at end of file diff --git a/dbSer/postgres/env.cfg b/dbSer/postgres/env.cfg index 390a953..0b41a19 100644 --- a/dbSer/postgres/env.cfg +++ b/dbSer/postgres/env.cfg @@ -1,7 +1,8 @@ +# 密码为生成的密码，请使用时修改后再部署 #IMAGE_TAG=postgres:14.11-bookworm #IMAGE_TAG=postgres:15.6-bookworm -IMAGE_TAG=postgres:16.8 -IMAGE_TAG_V17=postgres:17.4 -IMAGE_TAG_V15=postgres:15.12 -POSTGRES_PASSWORD=Kevin0412PgSql +IMAGE_TAG=postgres:16.10 +IMAGE_TAG_V17=postgres:17.6 +IMAGE_TAG_V15=postgres:15.14 +POSTGRES_PASSWORD=AGC4eGx2aq8rSiZXBP POSTGRES_HOST_AUTH_METHOD=scram-sha-256 \ No newline at end of file diff --git a/base/redis/env.cfg b/dbSer/redis/env.cfg similarity index 100% rename from base/redis/env.cfg rename to dbSer/redis/env.cfg diff --git a/base/redis/redis.stack.yml b/dbSer/redis/redis.stack.yml similarity index 100% rename from base/redis/redis.stack.yml rename to dbSer/redis/redis.stack.yml diff --git a/base/redis/valkey.stack.yml b/dbSer/redis/valkey.stack.yml similarity index 100% rename from base/redis/valkey.stack.yml rename to dbSer/redis/valkey.stack.yml From d31a2982b3aadef8075c4d91541d5ab6647649a2 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Fri, 15 Aug 2025 16:08:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix(dbSer):=20=E6=9B=B4=E6=96=B0Redis?= =?UTF-8?q?=E5=92=8CMySQL=E9=85=8D=E7=BD=AE=E5=8F=8A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BB=A3=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 From 03bc90e20ca9763ce84893e48b674862f4c21a3d Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Fri, 15 Aug 2025 17:37:41 +0800 Subject: [PATCH 5/8] =?UTF-8?q?build(golang):=20=E6=9B=B4=E6=96=B0Go?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E6=9E=84=E5=BB=BA=E9=95=9C=E5=83=8F=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=87=B31.25.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将构建环境中的Go语言镜像版本从1.23.5/1.22.11升级到1.25.0版本，同时更新对应的alpine和bookworm基础镜像 --- builder/golang/env.cnf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/builder/golang/env.cnf b/builder/golang/env.cnf index 1c46af6..46ff4c2 100644 --- a/builder/golang/env.cnf +++ b/builder/golang/env.cnf @@ -1,5 +1,3 @@ -IMAGE_TAG_BASH=golang:1.23.5-bookworm -IMAGE_TAG_ASH=golang:1.23.5-alpine -#IMAGE_TAG_BASH=golang:1.22.11-bookworm -#IMAGE_TAG_ASH=golang:1.22.11-alpine +IMAGE_TAG_BASH=golang:1.25.0-trixie +IMAGE_TAG_ASH=golang:1.25.0-alpine Volumes_Path=/data/volumes \ No newline at end of file From d85b729837f75ebb85bbbca906fe73aae4fd6706 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Fri, 15 Aug 2025 17:43:07 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat(builder):=20=E6=96=B0=E5=A2=9Enodejs?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E5=B9=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?golang=E6=8C=82=E8=BD=BD=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加nodejs的env.cfg配置文件及compose.yml模板 更新golang的compose.yml中volumes路径使用变量替换 --- builder/golang/compose.yml | 2 +- builder/nodejs/compose.yml | 13 +++++++++++++ builder/nodejs/env.cfg | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 builder/nodejs/compose.yml create mode 100644 builder/nodejs/env.cfg diff --git a/builder/golang/compose.yml b/builder/golang/compose.yml index 7bfd932..887dd8d 100644 --- a/builder/golang/compose.yml +++ b/builder/golang/compose.yml @@ -10,7 +10,7 @@ services: tty: true command: bash volumes: - - ${Volumes_Path}/mygits:/app + - ${Volumes_Path}/${PROJECT_NAME}:/app working_dir: /app environment: - GOPROXY=https://goproxy.cn,direct diff --git a/builder/nodejs/compose.yml b/builder/nodejs/compose.yml new file mode 100644 index 0000000..2c23976 --- /dev/null +++ b/builder/nodejs/compose.yml @@ -0,0 +1,13 @@ +# run:: docker compose -p memos --env-file ./builder/nodejs/env.cfg -f ./builder/nodejs/compose.yml up -d + +services: + + golang: + image: ${IMAGE_TAG_BASH} + container_name: "build-nodejs" + restart: always + tty: true + command: bash + volumes: + - ${Volumes_Path}/${PROJECT_NAME}:/app + working_dir: /app \ No newline at end of file diff --git a/builder/nodejs/env.cfg b/builder/nodejs/env.cfg new file mode 100644 index 0000000..a80b127 --- /dev/null +++ b/builder/nodejs/env.cfg @@ -0,0 +1,3 @@ +IMAGE_TAG_BASH=node:22.18.0-bookworm +IMAGE_TAG_ASH=node:22.18.0-alpine +Volumes_Path=/data/volumes \ No newline at end of file From 8f151f523dc054c285894b33f29259fbf4cbdbdc Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Fri, 15 Aug 2025 17:43:54 +0800 Subject: [PATCH 7/8] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0debian=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC=E4=B8=BA13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- builder/debian/env.cnf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/debian/env.cnf b/builder/debian/env.cnf index b5ddcb7..1ca3420 100644 --- a/builder/debian/env.cnf +++ b/builder/debian/env.cnf @@ -1 +1 @@ -IMAGE_TAG=debian:12 \ No newline at end of file +IMAGE_TAG=debian:13 \ No newline at end of file From 81ca6874aadfdb3132d1520bdde23986fbd046b5 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Fri, 15 Aug 2025 23:58:43 +0800 Subject: [PATCH 8/8] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0Gitea=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E7=89=88=E6=9C=AC=E8=87=B31.24.5-rootless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 升级Gitea容器镜像版本以获取最新的安全补丁和功能改进 --- gitea/env.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitea/env.cfg b/gitea/env.cfg index 09c6bca..b93e5bf 100644 --- a/gitea/env.cfg +++ b/gitea/env.cfg @@ -1,4 +1,4 @@ -IMAGE_TAG=gitea/gitea:1.24.3-rootless +IMAGE_TAG=gitea/gitea:1.24.5-rootless Volumes_PATH=/data/volumes/gitea LAY_SSH_HOST_PORT=22 SSH_HOST_PORT=2222 \ No newline at end of file