Merge pull request '合并by250815的版本更新' (#3) from cnphpbb/deploy.stack:main into main

Reviewed-on: DevOps/deploy.stack#3

base/redis/valkey.stack.yml

@@ -1,11 +0,0 @@
-# Pull: docker compose -p valkey --env-file ./base/redis/env.cfg -f ./base/redis/valkey.stack.yml pull
-
-# Run:: docker compose -p valkey --env-file ./base/redis/env.cfg -f ./base/redis/valkey.stack.yml up -d
-services:
-  redis:
-    image: ${IMAGE_TAG_VALKEYV8}
-    ports:
-      - '6379:6379'
-    command: valkey-server --appendonly yes
-    volumes:
-      - '${Volumes_PATH}/redis:/data'

builder/debian/env.cnf

@@ -1 +1 @@
-IMAGE_TAG=debian:12
+IMAGE_TAG=debian:13

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

builder/golang/env.cnf

@@ -1,5 +1,3 @@
-IMAGE_TAG_BASH=golang:1.23.5-bookworm
+IMAGE_TAG_BASH=golang:1.25.0-trixie
-IMAGE_TAG_ASH=golang:1.23.5-alpine
+IMAGE_TAG_ASH=golang:1.25.0-alpine
-#IMAGE_TAG_BASH=golang:1.22.11-bookworm
-#IMAGE_TAG_ASH=golang:1.22.11-alpine
 Volumes_Path=/data/volumes

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

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

dbSer/mysql/env.cfg

@@ -1,5 +1,6 @@
-IMAGE_TAG=mysql:8.4.5
+# 密码为生成的密码，请使用时修改后再部署
-IMAGE_TAG_V9=mysql:9.3.0
+IMAGE_TAG=mysql:8.4.6
-IMAGE_TAG_V8=mysql:8.0.42
+IMAGE_TAG_V9=mysql:9.4.0
-IMAGE_TAG_LTS=mysql:8.4.5
+IMAGE_TAG_V8=mysql:8.0.43
-MYSQL_ROOT_PASSWORD=Kevin%0412%Mysql
+IMAGE_TAG_LTS=mysql:8.4.6
+MYSQL_ROOT_PASSWORD=fwoK7vbXMuavrUuX6Q

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:
-    #command: --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci --default-authentication-plugin=mysql_native_password
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci
 
 volumes:
   mysql_data:

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=postgres:16.10
-IMAGE_TAG_V17=postgres:17.4
+IMAGE_TAG_V17=postgres:17.6
-IMAGE_TAG_V15=postgres:15.12
+IMAGE_TAG_V15=postgres:15.14
-POSTGRES_PASSWORD=Kevin0412PgSql
+POSTGRES_PASSWORD=AGC4eGx2aq8rSiZXBP
 POSTGRES_HOST_AUTH_METHOD=scram-sha-256

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

dbSer/redis/valkey.stack.yml

@@ -0,0 +1,11 @@
+# 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 ./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 --requirepass ${REDIS_PASSWORD}
+    volumes:
+      - '${Volumes_PATH}/redis:/data'

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

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
+IMAGE_TAG=portainer/portainer-ce:2.32.0
-AGENT_TAG=portainer/agent:2.27.9
+AGENT_TAG=portainer/agent:2.32.0

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: