chore: 更新镜像版本并移除敏感 env.cfg

- 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 敏感文件
This commit is contained in:
cnphpbb
2026-09-12 17:07:11 +08:00
parent bf0a4a583f
commit 95e17779e8
17 changed files with 23 additions and 89 deletions
-5
View File
@@ -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
-5
View File
@@ -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"
+1 -1
View File
@@ -8,7 +8,7 @@
# $EDITOR env.cfg # 填入真实密码/密钥后保存 # $EDITOR env.cfg # 填入真实密码/密钥后保存
# docker compose -p adminer --env-file ./env.cfg -f ./stack.yml up -d # 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} IMAGE_TAG=adminer:${IMAGE_TAG_VER}
+2 -6
View File
@@ -13,17 +13,13 @@
# ============================================================ # ============================================================
# 密码为生成的密码,请使用时修改后再部署 # 密码为生成的密码,请使用时修改后再部署
#IMAGE_TAG=postgres:14.11-bookworm
#IMAGE_TAG=postgres:15.6-bookworm IMAGE_TAG=postgres:16.15
IMAGE_TAG=postgres:16.14
IMAGE_TAG_V17=postgres:17.10 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=<your-strong-password> POSTGRES_PASSWORD=<your-strong-password>
+2 -5
View File
@@ -11,10 +11,7 @@
# ============================================================ # ============================================================
# ⚠️ 敏感值(必填,env.cfg 不提交) # ⚠️ 敏感值(必填,env.cfg 不提交)
# ============================================================ # ============================================================
IMAGE_TAG_REDISV6=redis:6.2.21-alpine IMAGE_TAG_REDIS_LATEST=redis:8.10.1
IMAGE_TAG_REDISV7=redis:7.4.7-alpine IMAGE_TAG_VALKEY_LATEST=valkey/valkey:9.1.2
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
Volumes_Path=/data/volumes/redis Volumes_Path=/data/volumes/redis
REDIS_PASSWORD=<your-strong-password> REDIS_PASSWORD=<your-strong-password>
+2 -2
View File
@@ -3,11 +3,11 @@
# Run:: docker compose -p redis --env-file ./dbSer/redis/env.cfg -f ./dbSer/redis/redis.stack.yml up -d # Run:: docker compose -p redis --env-file ./dbSer/redis/env.cfg -f ./dbSer/redis/redis.stack.yml up -d
services: services:
redis: redis:
image: ${IMAGE_TAG_REDISV8} image: ${IMAGE_TAG_REDIS_LATEST}
restart: always restart: always
ports: ports:
- '6379:6379' - '6379:6379'
command: redis-server --appendonly yes --requirepass ${REDIS_PASSWORD} command: redis-server --appendonly yes --requirepass ${REDIS_PASSWORD}
volumes: volumes:
- '${Volumes_Path}/redis_data:/data' - '${Volumes_Path}/redis_data:/data'
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
+2 -2
View File
@@ -3,7 +3,7 @@
# Run:: docker compose -p valkey --env-file ./dbSer/redis/env.cfg -f ./dbSer/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: services:
redis: redis:
image: ${IMAGE_TAG_VALKEYV8} image: ${IMAGE_TAG_VALKEY_LATEST}
restart: always restart: always
ports: ports:
- '6379:6379' - '6379:6379'
@@ -18,4 +18,4 @@ services:
- REDIS_DB=0 - REDIS_DB=0
- REDIS_MAXMEMORY=256mb - REDIS_MAXMEMORY=256mb
- REDIS_MAXMEMORYPOLICY=allkeys-lru - REDIS_MAXMEMORYPOLICY=allkeys-lru
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
-10
View File
@@ -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
+1 -1
View File
@@ -11,7 +11,7 @@
# ============================================================ # ============================================================
# ⚠️ 敏感值(必填,amd.env.cfg 不提交) # ⚠️ 敏感值(必填,amd.env.cfg 不提交)
# ============================================================ # ============================================================
IMAGE_TAG=joplin/server:3.6.1 IMAGE_TAG=joplin/server:3.7.2
# only amd64 # only amd64
-12
View File
@@ -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
+1 -1
View File
@@ -15,7 +15,7 @@
#IMAGE_TAG=florider89/joplin-server:2.14.2 #IMAGE_TAG=florider89/joplin-server:2.14.2
IMAGE_TAG=joplin/server:3.6.1 IMAGE_TAG=joplin/server:3.7.2
# only amd64 # only amd64
-24
View File
@@ -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
+2 -2
View File
@@ -11,9 +11,9 @@
# ============================================================ # ============================================================
# ⚠️ 敏感值(必填,env.cfg 不提交) # ⚠️ 敏感值(必填,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
+8 -8
View File
@@ -14,30 +14,30 @@ services:
- DB_POSTGRESDB_USER=${POSTGRES_USER} - DB_POSTGRESDB_USER=${POSTGRES_USER}
- DB_POSTGRESDB_PASSWORD=${POSTGRES_PASSWORD} - DB_POSTGRESDB_PASSWORD=${POSTGRES_PASSWORD}
- DB_POSTGRESDB_SCHEMA=public - DB_POSTGRESDB_SCHEMA=public
# n8n基础配置 # n8n基础配置
- N8N_BASIC_AUTH_ACTIVE=${N8N_BASIC_AUTH_ACTIVE} - N8N_BASIC_AUTH_ACTIVE=${N8N_BASIC_AUTH_ACTIVE}
- N8N_BASIC_AUTH_USER=${N8N_BASIC_AUTH_USER} - N8N_BASIC_AUTH_USER=${N8N_BASIC_AUTH_USER}
- N8N_BASIC_AUTH_PASSWORD=${N8N_BASIC_AUTH_PASSWORD} - N8N_BASIC_AUTH_PASSWORD=${N8N_BASIC_AUTH_PASSWORD}
# 时区 # 时区
- GENERIC_TIMEZONE=${GENERIC_TIMEZONE} - GENERIC_TIMEZONE=${GENERIC_TIMEZONE}
- TZ=${TZ} - TZ=${TZ}
# Webhook配置 # Webhook配置
- WEBHOOK_URL=${WEBHOOK_URL} - WEBHOOK_URL=${WEBHOOK_URL}
# 加密密钥 # 加密密钥
- N8N_ENCRYPTION_KEY=${N8N_ENCRYPTION_KEY} - N8N_ENCRYPTION_KEY=${N8N_ENCRYPTION_KEY}
# 可选:禁用遥测 # 可选:禁用遥测
- N8N_DIAGNOSTICS_ENABLED=false - N8N_DIAGNOSTICS_ENABLED=false
# 可选:内存优化 # 可选:内存优化
- NODE_OPTIONS=--max-old-space-size=2048 - NODE_OPTIONS=--max-old-space-size=2048
volumes: volumes:
- n8n_data:/home/node/.n8n - n8n_data:/home/node/.n8n
- ./local-files:/files - ./local-files:/files
volumes: volumes:
n8n_data: n8n_data:
-3
View File
@@ -1,3 +0,0 @@
IMAGE_TAG_V3=traefik:v3.5.1
IMAGE_TAG_V2=traefik:v2.11.29
IMAGE_TAG_LATEST=traefik:latest
+1 -1
View File
@@ -8,7 +8,7 @@
# $EDITOR env.cfg # 填入真实密码/密钥后保存 # $EDITOR env.cfg # 填入真实密码/密钥后保存
# docker compose -p traefik --env-file ./env.cfg -f ./stack.yml up -d # 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 IMAGE_TAG_V2=traefik:v2.11.29
+1 -1
View File
@@ -8,6 +8,6 @@
# $EDITOR env.cfg # 填入真实密码/密钥后保存 # $EDITOR env.cfg # 填入真实密码/密钥后保存
# docker compose -p victoriametrics --env-file ./env.cfg -f ./stack.yml up -d # 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 Volumes_Path=/data/volumes/VictoriaMetrics