From c4bbedd735504b8b85114c9b77f1c59bc2bc966b Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Sat, 12 Sep 2026 18:38:54 +0800 Subject: [PATCH] =?UTF-8?q?chore(dbSer):=20=E6=9B=B4=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=95=9C=E5=83=8F=E6=A0=87=E7=AD=BE=E5=B9=B6?= =?UTF-8?q?=E6=B8=85=E7=90=86=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除误提交的 env.cfg（couchdb、ntfy） - dbs-dev/dbs 栈镜像统一改为 latest 并清理行尾空白 - mysql 环境变量重命名为 IMAGE_TAG_LATEST 并更新版本 - 更新 loki、grafana、haproxy、ntfy、traefik 镜像版本 - postgres.yml 修正 latest 拼写错误 --- dbSer/couchdb/env.cfg | 5 ----- dbSer/dbs-dev.stack.yaml | 13 ++++++------- dbSer/dbs.stack.yaml | 10 +++++----- dbSer/etcd.yml | 4 ++-- dbSer/loki/env.cfg.example | 2 +- dbSer/mongo.yml | 4 ++-- dbSer/mysql/env.cfg.example | 8 ++++---- dbSer/mysql/prod.stack.yml | 3 ++- dbSer/percona.yml | 4 ++-- dbSer/postgres.yml | 4 ++-- dbSer/redis.yml | 2 +- grafana/env.cfg.example | 2 +- haproxy/env.cfg.example | 2 +- ntfy/env.cfg | 4 ---- ntfy/env.cfg.example | 2 +- traefik/env.cfg.example | 2 +- 16 files changed, 31 insertions(+), 40 deletions(-) delete mode 100644 dbSer/couchdb/env.cfg delete mode 100644 ntfy/env.cfg diff --git a/dbSer/couchdb/env.cfg b/dbSer/couchdb/env.cfg deleted file mode 100644 index f73effc..0000000 --- a/dbSer/couchdb/env.cfg +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_TAG=couchdb:3.5 -COUCHDB_PORT=5984 -COUCHDB_USER=your_custom_user -COUCHDB_PASSWORD=your_strong_password -Volumes_Path=/data/volumes/couchdb diff --git a/dbSer/dbs-dev.stack.yaml b/dbSer/dbs-dev.stack.yaml index 4524966..44957c2 100644 --- a/dbSer/dbs-dev.stack.yaml +++ b/dbSer/dbs-dev.stack.yaml @@ -1,9 +1,8 @@ # docker compose -p dbs -f ./dbSer/dbs-dev.stack.yaml up -d -version: "3.8" services: redis: - image: redis:6-alpine + image: redis:latest container_name: Dev-Redis restart: always command: "--requirepass Kevin#0412&Redis" @@ -16,7 +15,7 @@ services: ipv4_address: 172.22.10.205 percona: - image: percona:8.0.35-27 + image: percona:latest container_name: Dev-Percona restart: always environment: @@ -31,7 +30,7 @@ services: ipv4_address: 172.22.10.206 etcd: - image: quay.io/coreos/etcd:v3.5.0 + image: quay.io/coreos/etcd:latest container_name: Dev-Etcd restart: always volumes: @@ -48,7 +47,7 @@ services: - --advertise-client-urls=http://0.0.0.0:2379 postgre: - image: postgres:16.2-bookworm + image: postgres:latest container_name: Dev-postgre restart: always environment: @@ -60,9 +59,9 @@ services: networks: DevNet: ipv4_address: 172.22.10.208 - + mongo: - image: mongo:5.0 + image: mongo:latest restart: always container_name: "Dev-Mongo" environment: diff --git a/dbSer/dbs.stack.yaml b/dbSer/dbs.stack.yaml index e7f3f3a..5c5da32 100644 --- a/dbSer/dbs.stack.yaml +++ b/dbSer/dbs.stack.yaml @@ -1,4 +1,4 @@ -version: '3.8' + services: mongo4.4: @@ -17,7 +17,7 @@ services: networks: dbs-net: ipv4_address: 172.25.0.219 - + redis5: image: hub.node:3500/redis:5-alpine container_name: "Dev-redis5" @@ -30,7 +30,7 @@ services: ipv4_address: 172.25.0.209 ports: - "6379:6379" - + mysql8: image: hub.node:3500/percona:8 container_name: "Dev-percona8" @@ -45,7 +45,7 @@ services: dbs-net: ipv4_address: 172.25.0.251 ports: - - "3306:3306" + - "3306:3306" volumes: mongo_config: @@ -62,4 +62,4 @@ networks: ipam: driver: default config: - - subnet: 172.25.0.0/24 \ No newline at end of file + - subnet: 172.25.0.0/24 diff --git a/dbSer/etcd.yml b/dbSer/etcd.yml index 8ee483b..a347b07 100644 --- a/dbSer/etcd.yml +++ b/dbSer/etcd.yml @@ -1,6 +1,6 @@ services: etcd: - image: quay.io/coreos/etcd:v3.5.0 + image: quay.io/coreos/etcd:latest container_name: Dev-Etcd restart: always volumes: @@ -17,4 +17,4 @@ services: - --advertise-client-urls=http://0.0.0.0:2379 volumes: - etcd-data: \ No newline at end of file + etcd-data: diff --git a/dbSer/loki/env.cfg.example b/dbSer/loki/env.cfg.example index 0c6fa28..d74b0c6 100644 --- a/dbSer/loki/env.cfg.example +++ b/dbSer/loki/env.cfg.example @@ -8,6 +8,6 @@ # $EDITOR env.cfg # 填入真实密码/密钥后保存 # docker compose -p loki --env-file ./env.cfg -f ./stack.yml up -d # -IMAGE_TAG=3.6.2 +IMAGE_TAG=3.7.7 IMAGE_NAME=grafana/loki:${IMAGE_TAG} diff --git a/dbSer/mongo.yml b/dbSer/mongo.yml index ca203cb..a731f0d 100644 --- a/dbSer/mongo.yml +++ b/dbSer/mongo.yml @@ -1,6 +1,6 @@ services: mongo: - image: mongo:5.0 + image: mongo:latest restart: always container_name: "Dev-Mongo" environment: @@ -17,4 +17,4 @@ services: volumes: mongo_data: - mongo_configdb: \ No newline at end of file + mongo_configdb: diff --git a/dbSer/mysql/env.cfg.example b/dbSer/mysql/env.cfg.example index 3767f0b..c904c32 100644 --- a/dbSer/mysql/env.cfg.example +++ b/dbSer/mysql/env.cfg.example @@ -13,13 +13,13 @@ # ============================================================ # 密码为生成的密码，请使用时修改后再部署 -IMAGE_TAG=mysql:8.4 +IMAGE_TAG_V8=mysql:8.4.11 -IMAGE_TAG_V9=mysql:9.7 +IMAGE_TAG_V9=mysql:9.7.2 -IMAGE_TAG_V8=mysql:8.0 +IMAGE_TAG_LATEST=mysql:26.7.0 -IMAGE_TAG_LTS=mysql:8.4 +IMAGE_TAG_LTS=${IMAGE_TAG_LATEST} MYSQL_ROOT_PASSWORD= diff --git a/dbSer/mysql/prod.stack.yml b/dbSer/mysql/prod.stack.yml index 81a05ba..f4927a7 100644 --- a/dbSer/mysql/prod.stack.yml +++ b/dbSer/mysql/prod.stack.yml @@ -3,7 +3,8 @@ services: mysql: - image: ${IMAGE_TAG_V9} + ## 使用最新的 MySQL 镜像, 如果需要指定版本, 请修改 IMAGE_TAG_LATEST 环境变量 + image: ${IMAGE_TAG_LATEST} container_name: Dev-MySQL restart: always environment: diff --git a/dbSer/percona.yml b/dbSer/percona.yml index 6244d56..06bf5f9 100644 --- a/dbSer/percona.yml +++ b/dbSer/percona.yml @@ -1,6 +1,6 @@ services: percona: - image: percona:8.0.35-27 + image: percona:latest container_name: Dev-Percona restart: always environment: @@ -16,4 +16,4 @@ services: volumes: percona_data: - percona_logs: \ No newline at end of file + percona_logs: diff --git a/dbSer/postgres.yml b/dbSer/postgres.yml index 25627a3..9133755 100644 --- a/dbSer/postgres.yml +++ b/dbSer/postgres.yml @@ -3,7 +3,7 @@ services: postgres: - image: postgres:16.2-bookworm + image: postgres:lastest container_name: Dev-postgre restart: always environment: @@ -20,4 +20,4 @@ services: ipv4_address: 172.22.10.208 volumes: - postgresql_data: \ No newline at end of file + postgresql_data: diff --git a/dbSer/redis.yml b/dbSer/redis.yml index 8bc5664..dfb433e 100644 --- a/dbSer/redis.yml +++ b/dbSer/redis.yml @@ -1,6 +1,6 @@ services: redis: - image: redis:7.2.4-alpine + image: redis:latest container_name: Dev-Redis restart: always command: "--requirepass Kevin#0412&Redis" diff --git a/grafana/env.cfg.example b/grafana/env.cfg.example index 590f9c4..2fa5a6b 100644 --- a/grafana/env.cfg.example +++ b/grafana/env.cfg.example @@ -8,6 +8,6 @@ # $EDITOR env.cfg # 填入真实密码/密钥后保存 # docker compose -p grafana --env-file ./env.cfg -f ./stack.yml up -d # -IMAGE_TAG_VER=13.0.2 +IMAGE_TAG_VER=13.2.1 IMAGE_TAG=grafana/grafana:${IMAGE_TAG_VER} diff --git a/haproxy/env.cfg.example b/haproxy/env.cfg.example index e5eaa36..dc3d15b 100644 --- a/haproxy/env.cfg.example +++ b/haproxy/env.cfg.example @@ -8,7 +8,7 @@ # $EDITOR env.cfg # 填入真实密码/密钥后保存 # docker compose -p haproxy --env-file ./env.cfg -f ./stack.yml up -d # -IMAGE_TAG_VER=3.3.0 +IMAGE_TAG_VER=3.4.4 IMAGE_TAG_DEV=3.4-dev diff --git a/ntfy/env.cfg b/ntfy/env.cfg deleted file mode 100644 index 8c81d8c..0000000 --- a/ntfy/env.cfg +++ /dev/null @@ -1,4 +0,0 @@ - -IMAGE_TAG_VER=v2.15 -IMAGE_TAG=binwiederhier/ntfy:${IMAGE_TAG_VER} -Volumes_Path=/data/volumes/ntfy \ No newline at end of file diff --git a/ntfy/env.cfg.example b/ntfy/env.cfg.example index c86f0e3..7124b69 100644 --- a/ntfy/env.cfg.example +++ b/ntfy/env.cfg.example @@ -10,7 +10,7 @@ # -IMAGE_TAG_VER=v2.24 +IMAGE_TAG_VER=v2.28.0 IMAGE_TAG=binwiederhier/ntfy:${IMAGE_TAG_VER} diff --git a/traefik/env.cfg.example b/traefik/env.cfg.example index 92dc920..e45bad7 100644 --- a/traefik/env.cfg.example +++ b/traefik/env.cfg.example @@ -12,4 +12,4 @@ IMAGE_TAG_V3=traefik:v3.7.13 IMAGE_TAG_V2=traefik:v2.11.29 -IMAGE_TAG_LATEST=traefik:latest +IMAGE_TAG_LATEST=${IMAGE_TAG_V3}