From 95e17779e828546d832caa0ae015d55e61995231 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Sat, 12 Sep 2026 17:07:11 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=B9=B6=E7=A7=BB=E9=99=A4=E6=95=8F=E6=84=9F?= =?UTF-8?q?=20env.cfg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - adminer 5.4.2 -> 6.0.1-fastcgi - joplin 3.6.1 -> 3.7.2 - n8n 2.3.6/2.4.4 -> 2.39.4/2.4.4 - traefik v3.5.1 -> v3.7.13 - victoriametrics v1.126.0 -> v1.151.0 - postgres 16.15/18.6 - redis/valkey 镜像变量重命名并更新版本 - 删除误提交的 env.cfg 敏感文件 --- VaultWarden/env.cfg | 5 ----- WireGuardVPN/wg-easy/env.cfg | 5 ----- adminer/env.cfg.example | 2 +- dbSer/postgres/env.cfg.example | 8 ++------ dbSer/redis/env.cfg.example | 7 ++----- dbSer/redis/redis.stack.yml | 4 ++-- dbSer/redis/valkey.stack.yml | 4 ++-- joplin/amd.env.cfg | 10 ---------- joplin/amd.env.cfg.example | 2 +- joplin/env.cfg | 12 ------------ joplin/env.cfg.example | 2 +- n8n/env.cfg | 24 ------------------------ n8n/env.cfg.example | 4 ++-- n8n/stack.yml | 16 ++++++++-------- traefik/env.cfg | 3 --- traefik/env.cfg.example | 2 +- victoriametrics/env.cfg.example | 2 +- 17 files changed, 23 insertions(+), 89 deletions(-) delete mode 100644 VaultWarden/env.cfg delete mode 100644 WireGuardVPN/wg-easy/env.cfg delete mode 100644 joplin/amd.env.cfg delete mode 100644 joplin/env.cfg delete mode 100644 n8n/env.cfg delete mode 100644 traefik/env.cfg diff --git a/VaultWarden/env.cfg b/VaultWarden/env.cfg deleted file mode 100644 index d4dcac6..0000000 --- a/VaultWarden/env.cfg +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_TAG_VER=1.36.0-alpine -IMAGE_TAG=vaultwarden/server:${IMAGE_TAG_VER} -Volumes_Path=/data/volumes/VaultWarden -Domain=https://passd.6t7.net -ADMIN_TOKEN=WVslcLMfxXxzU631CFsU2gLwtfYIvxosQbPTxFL5MVikdcSAc9v6GxbFeiICFoMHcyBA7KFO6v1k diff --git a/WireGuardVPN/wg-easy/env.cfg b/WireGuardVPN/wg-easy/env.cfg deleted file mode 100644 index 23bd3f7..0000000 --- a/WireGuardVPN/wg-easy/env.cfg +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_TAG_VER=15.2.2 -IMAGE_TAG=hub.6t7.net/base/wg-easy:${IMAGE_TAG_VER} -Volumes_Path=/data/volumes/wg-easy -WG_HOST=man.tp229.com -WG_PASSWORD="pR3#q9sGtY5LmN1aBcDfEhIjK0lMnOqP2rS" diff --git a/adminer/env.cfg.example b/adminer/env.cfg.example index acb48e1..6a610b1 100644 --- a/adminer/env.cfg.example +++ b/adminer/env.cfg.example @@ -8,7 +8,7 @@ # $EDITOR env.cfg # 填入真实密码/密钥后保存 # docker compose -p adminer --env-file ./env.cfg -f ./stack.yml up -d # -IMAGE_TAG_VER=5.4.2 +IMAGE_TAG_VER=6.0.1-fastcgi IMAGE_TAG=adminer:${IMAGE_TAG_VER} diff --git a/dbSer/postgres/env.cfg.example b/dbSer/postgres/env.cfg.example index 41a6d85..4f23b83 100644 --- a/dbSer/postgres/env.cfg.example +++ b/dbSer/postgres/env.cfg.example @@ -13,17 +13,13 @@ # ============================================================ # 密码为生成的密码，请使用时修改后再部署 -#IMAGE_TAG=postgres:14.11-bookworm -#IMAGE_TAG=postgres:15.6-bookworm - -IMAGE_TAG=postgres:16.14 +IMAGE_TAG=postgres:16.15 IMAGE_TAG_V17=postgres:17.10 -IMAGE_TAG_V18=postgres:18.4 +IMAGE_TAG_V18=postgres:18.6 -IMAGE_TAG_V15=postgres:15.18 POSTGRES_PASSWORD= diff --git a/dbSer/redis/env.cfg.example b/dbSer/redis/env.cfg.example index 61f0645..0dff399 100644 --- a/dbSer/redis/env.cfg.example +++ b/dbSer/redis/env.cfg.example @@ -11,10 +11,7 @@ # ============================================================ # ⚠️ 敏感值（必填，env.cfg 不提交） # ============================================================ -IMAGE_TAG_REDISV6=redis:6.2.21-alpine -IMAGE_TAG_REDISV7=redis:7.4.7-alpine -IMAGE_TAG_REDISV8=redis:8.4.0-alpine -IMAGE_TAG_VALKEY_Latest=valkey/valkey:9.0.0 -IMAGE_TAG_VALKEY_V8=valkey/valkey:8.1.5 +IMAGE_TAG_REDIS_LATEST=redis:8.10.1 +IMAGE_TAG_VALKEY_LATEST=valkey/valkey:9.1.2 Volumes_Path=/data/volumes/redis REDIS_PASSWORD= diff --git a/dbSer/redis/redis.stack.yml b/dbSer/redis/redis.stack.yml index 958ed96..cc984d7 100644 --- a/dbSer/redis/redis.stack.yml +++ b/dbSer/redis/redis.stack.yml @@ -3,11 +3,11 @@ # Run:: docker compose -p redis --env-file ./dbSer/redis/env.cfg -f ./dbSer/redis/redis.stack.yml up -d services: redis: - image: ${IMAGE_TAG_REDISV8} + image: ${IMAGE_TAG_REDIS_LATEST} restart: always ports: - '6379:6379' - command: redis-server --appendonly yes --requirepass ${REDIS_PASSWORD} + command: redis-server --appendonly yes --requirepass ${REDIS_PASSWORD} volumes: - '${Volumes_Path}/redis_data:/data' - /etc/timezone:/etc/timezone:ro diff --git a/dbSer/redis/valkey.stack.yml b/dbSer/redis/valkey.stack.yml index a12753f..a6e12bf 100644 --- a/dbSer/redis/valkey.stack.yml +++ b/dbSer/redis/valkey.stack.yml @@ -3,7 +3,7 @@ # 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} + image: ${IMAGE_TAG_VALKEY_LATEST} restart: always ports: - '6379:6379' @@ -18,4 +18,4 @@ services: - REDIS_DB=0 - REDIS_MAXMEMORY=256mb - REDIS_MAXMEMORYPOLICY=allkeys-lru - - TZ=Asia/Shanghai \ No newline at end of file + - TZ=Asia/Shanghai diff --git a/joplin/amd.env.cfg b/joplin/amd.env.cfg deleted file mode 100644 index b815fd3..0000000 --- a/joplin/amd.env.cfg +++ /dev/null @@ -1,10 +0,0 @@ -IMAGE_TAG=joplin/server:3.6.1 -# only amd64 -#IMAGE_TAG=joplin/server:2.14.2-beta -## 实际部署时需要考虑APP_BASE_URL变量值 -APP_BASE_URL=https://joplin.6t7.net -POSTGRES_USER=postgres -POSTGRES_PASSWORD=Kevin0412PgSql -POSTGRES_DATABASE=joplin-db -POSTGRES_PORT=5432 -POSTGRES_HOST=10.0.74.3 \ No newline at end of file diff --git a/joplin/amd.env.cfg.example b/joplin/amd.env.cfg.example index a78fcf4..631598e 100644 --- a/joplin/amd.env.cfg.example +++ b/joplin/amd.env.cfg.example @@ -11,7 +11,7 @@ # ============================================================ # ⚠️ 敏感值（必填，amd.env.cfg 不提交） # ============================================================ -IMAGE_TAG=joplin/server:3.6.1 +IMAGE_TAG=joplin/server:3.7.2 # only amd64 diff --git a/joplin/env.cfg b/joplin/env.cfg deleted file mode 100644 index 1885ed4..0000000 --- a/joplin/env.cfg +++ /dev/null @@ -1,12 +0,0 @@ -#IMAGE_TAG=etechonomy/joplin-server:2.14.2 -#IMAGE_TAG=florider89/joplin-server:2.14.2 -IMAGE_TAG=joplin/server:3.6.1 -# only amd64 -#IMAGE_TAG=joplin/server:2.14.2-beta -## 实际部署时需要考虑APP_BASE_URL变量值 -APP_BASE_URL=http://192.168.100.184:22300 -POSTGRES_USER=postgres -POSTGRES_PASSWORD=Kevin0412PgSql -POSTGRES_DATABASE=joplin-db -POSTGRES_PORT=5432 -POSTGRES_HOST=192.168.100.184 \ No newline at end of file diff --git a/joplin/env.cfg.example b/joplin/env.cfg.example index a88296e..091015c 100644 --- a/joplin/env.cfg.example +++ b/joplin/env.cfg.example @@ -15,7 +15,7 @@ #IMAGE_TAG=florider89/joplin-server:2.14.2 -IMAGE_TAG=joplin/server:3.6.1 +IMAGE_TAG=joplin/server:3.7.2 # only amd64 diff --git a/n8n/env.cfg b/n8n/env.cfg deleted file mode 100644 index 3456e21..0000000 --- a/n8n/env.cfg +++ /dev/null @@ -1,24 +0,0 @@ -IMAGE_TAG_LATEST=2.3.6 -IMAGE_TAG_Pre=2.4.4 - -# 数据库连接配置 -POSTGRES_HOST=localhost -POSTGRES_PORT=5432 -POSTGRES_DB=n8n -POSTGRES_USER=n8n -POSTGRES_PASSWORD=n8n_password - -# n8n基础配置 -N8N_BASIC_AUTH_ACTIVE=true -N8N_BASIC_AUTH_USER=admin -N8N_BASIC_AUTH_PASSWORD=admin_password - -# 时区 -GENERIC_TIMEZONE=Asia/Shanghai -TZ=Asia/Shanghai - -# Webhook配置 -WEBHOOK_URL=http://localhost:5678 - -# 加密密钥 -N8N_ENCRYPTION_KEY=your_encryption_key_here \ No newline at end of file diff --git a/n8n/env.cfg.example b/n8n/env.cfg.example index d2843ef..e95cdf1 100644 --- a/n8n/env.cfg.example +++ b/n8n/env.cfg.example @@ -11,9 +11,9 @@ # ============================================================ # ⚠️ 敏感值（必填，env.cfg 不提交） # ============================================================ -IMAGE_TAG_LATEST=2.3.6 +IMAGE_TAG_LATEST=2.39.4 -IMAGE_TAG_Pre=2.4.4 +IMAGE_TAG_PRE=2.4.4 diff --git a/n8n/stack.yml b/n8n/stack.yml index 79abdfb..5983d57 100644 --- a/n8n/stack.yml +++ b/n8n/stack.yml @@ -14,30 +14,30 @@ services: - DB_POSTGRESDB_USER=${POSTGRES_USER} - DB_POSTGRESDB_PASSWORD=${POSTGRES_PASSWORD} - DB_POSTGRESDB_SCHEMA=public - + # n8n基础配置 - N8N_BASIC_AUTH_ACTIVE=${N8N_BASIC_AUTH_ACTIVE} - N8N_BASIC_AUTH_USER=${N8N_BASIC_AUTH_USER} - N8N_BASIC_AUTH_PASSWORD=${N8N_BASIC_AUTH_PASSWORD} - + # 时区 - GENERIC_TIMEZONE=${GENERIC_TIMEZONE} - TZ=${TZ} - + # Webhook配置 - WEBHOOK_URL=${WEBHOOK_URL} - + # 加密密钥 - N8N_ENCRYPTION_KEY=${N8N_ENCRYPTION_KEY} - + # 可选：禁用遥测 - N8N_DIAGNOSTICS_ENABLED=false - + # 可选：内存优化 - NODE_OPTIONS=--max-old-space-size=2048 - + volumes: - n8n_data:/home/node/.n8n - ./local-files:/files volumes: - n8n_data: \ No newline at end of file + n8n_data: diff --git a/traefik/env.cfg b/traefik/env.cfg deleted file mode 100644 index 859e568..0000000 --- a/traefik/env.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_TAG_V3=traefik:v3.5.1 -IMAGE_TAG_V2=traefik:v2.11.29 -IMAGE_TAG_LATEST=traefik:latest \ No newline at end of file diff --git a/traefik/env.cfg.example b/traefik/env.cfg.example index 563eaad..92dc920 100644 --- a/traefik/env.cfg.example +++ b/traefik/env.cfg.example @@ -8,7 +8,7 @@ # $EDITOR env.cfg # 填入真实密码/密钥后保存 # docker compose -p traefik --env-file ./env.cfg -f ./stack.yml up -d # -IMAGE_TAG_V3=traefik:v3.5.1 +IMAGE_TAG_V3=traefik:v3.7.13 IMAGE_TAG_V2=traefik:v2.11.29 diff --git a/victoriametrics/env.cfg.example b/victoriametrics/env.cfg.example index e50fbd1..bd59b30 100644 --- a/victoriametrics/env.cfg.example +++ b/victoriametrics/env.cfg.example @@ -8,6 +8,6 @@ # $EDITOR env.cfg # 填入真实密码/密钥后保存 # docker compose -p victoriametrics --env-file ./env.cfg -f ./stack.yml up -d # -IMAGE_TAG=victoriametrics/victoria-metrics:v1.126.0 +IMAGE_TAG=victoriametrics/victoria-metrics:v1.151.0 Volumes_Path=/data/volumes/VictoriaMetrics