From 9e325ddf2bf2b7700443f28104c0016b644d9684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E6=A3=AE=E6=9E=97?= Date: Wed, 22 Apr 2026 14:51:05 +0800 Subject: [PATCH] =?UTF-8?q?fix(baota):=20=E5=AE=9D=E5=A1=94=20compose=20?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=95=9C=E5=83=8F=E5=88=87=E5=88=B0=E5=8D=8E?= =?UTF-8?q?=E4=B8=BA=E4=BA=91=20SWR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 与 Shell install.sh / 仓库 docker-compose.yml 行为对齐：所有 jeepay 业务镜像 + MySQL / Redis / RocketMQ / Nginx 默认都走华为云 SWR 公开 仓库，国内部署无需 Docker Hub 加速器。 实现：各 image 字段改为 ${XXX_IMAGE:-swr.cn-south-1.myhuaweicloud.com /jeepay/...} 带合理默认值的环境变量形式，用户 / 宝塔模板不设任何变量 即走 SWR；想回 Docker Hub 上游镜像时 export 对应 *_IMAGE 即可。 alpine/git（配置分发 init 容器）保持 Docker Hub，体积 < 20MB 且只在 install 时一次性拉取，SWR 里暂未同步；如有需要可通过 JEEPAY_CONFIGS_IMAGE 覆盖到自有镜像。 文件头部注释说明这一设计；docs/deploy/baota.md "宝塔应用模板要声明的 变量"拆成必须 / 可选两节，列清单 + 给整套切回 Docker Hub 的示例。 docker compose config 双场景校验通过： - 默认：所有 image 解析为 swr.cn-south-1.myhuaweicloud.com/jeepay/* - 覆盖：导出 *_IMAGE=xxx 后解析为 Docker Hub 格式 本地 test_*.sh PASS。 --- docker-compose.baota.yml | 29 ++++++++++++++++++++--------- docs/deploy/baota.md | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 10 deletions(-) diff --git a/docker-compose.baota.yml b/docker-compose.baota.yml index 0495e79..501df6e 100644 --- a/docker-compose.baota.yml +++ b/docker-compose.baota.yml @@ -6,6 +6,12 @@ # 用户不 git clone 源码，所有配置文件通过 jeepay-configs 这个 init # 容器（alpine/git 镜像）从 git 拉下来再分发到宿主共享卷 # +# 镜像默认仓库： +# 所有业务镜像 + MySQL / Redis / RocketMQ / Nginx 默认走华为云 SWR 公开仓库 +# （swr.cn-south-1.myhuaweicloud.com/jeepay/*），由计全官方维护，国内直拉， +# 不依赖 Docker Hub 加速器。alpine/git 仍用 Docker Hub（体积 < 20MB，一次 +# 性拉取）。想回 Docker Hub 上游镜像时，可通过下面的 *_IMAGE 环境变量覆盖。 +# # 环境变量（由宝塔 app 模板声明）： # VERSION 业务镜像 tag（jeepay-manager/merchant/payment） # CONFIG_REF 配置源 git ref（建议与 VERSION 同版本，或 master） @@ -14,6 +20,11 @@ # WEB_HTTP_PORT1/2/3 对外端口（分别映射到 19216 / 19217 / 19218） # CPUS / MEMORY_LIMIT nginx 资源限制 # +# 可选环境变量（想改镜像源时覆盖，各自带合理默认值）： +# MYSQL_IMAGE / REDIS_IMAGE / ROCKETMQ_IMAGE / NGINX_IMAGE +# MANAGER_IMAGE / MERCHANT_IMAGE / PAYMENT_IMAGE +# JEEPAY_CONFIGS_IMAGE +# # 首次安装后配置文件都在 ${APP_PATH}/jeepayhomes/jeepayConfigs/，用户可直接 # 编辑；jeepay-configs 用 cp -n 保护已存在文件不被覆盖；最新模板始终同步 # 到 ${APP_PATH}/jeepayhomes/jeepayConfigs/.latest/，升级时 diff 对比。 @@ -24,7 +35,7 @@ services: # - cp -n 铺到共享卷，已存在文件跳过（保护用户编辑） # - 最新模板同时刷到 .latest/，升级时 diff 对比 jeepay-configs: - image: alpine/git:2.40 + image: ${JEEPAY_CONFIGS_IMAGE:-alpine/git:2.40} container_name: jeepay-configs volumes: - ${APP_PATH}/jeepayhomes/:/jeepayhomes @@ -69,7 +80,7 @@ services: # MySQL mysql: - image: mysql:8.0.25 + image: ${MYSQL_IMAGE:-swr.cn-south-1.myhuaweicloud.com/jeepay/mysql:8.0.25} container_name: mysql8 hostname: mysql restart: always @@ -100,7 +111,7 @@ services: # Redis redis: - image: redis:6.2.14 + image: ${REDIS_IMAGE:-swr.cn-south-1.myhuaweicloud.com/jeepay/redis:6.2.14} container_name: redis6 hostname: redis restart: always @@ -125,7 +136,7 @@ services: # RocketMQ NameServer rocketmq-namesrv: - image: apache/rocketmq:5.3.1 + image: ${ROCKETMQ_IMAGE:-swr.cn-south-1.myhuaweicloud.com/jeepay/rocketmq:5.3.1} platform: linux/amd64 container_name: rocketmq-namesrv hostname: rocketmq-namesrv @@ -152,7 +163,7 @@ services: # RocketMQ Broker（brokerIP1 = 容器名，不依赖宿主网络布局） rocketmq-broker: - image: apache/rocketmq:5.3.1 + image: ${ROCKETMQ_IMAGE:-swr.cn-south-1.myhuaweicloud.com/jeepay/rocketmq:5.3.1} platform: linux/amd64 container_name: rocketmq-broker hostname: rocketmq-broker @@ -185,7 +196,7 @@ services: # jeepay 运营平台 API jeepay-manager: - image: jeepay/jeepay-manager:${VERSION} + image: ${MANAGER_IMAGE:-swr.cn-south-1.myhuaweicloud.com/jeepay/jeepay-manager:${VERSION}} container_name: jeepaymanager restart: always depends_on: @@ -215,7 +226,7 @@ services: # jeepay 商户平台 API jeepay-merchant: - image: jeepay/jeepay-merchant:${VERSION} + image: ${MERCHANT_IMAGE:-swr.cn-south-1.myhuaweicloud.com/jeepay/jeepay-merchant:${VERSION}} container_name: jeepaymerchant restart: always depends_on: @@ -245,7 +256,7 @@ services: # jeepay 支付网关 API jeepay-payment: - image: jeepay/jeepay-payment:${VERSION} + image: ${PAYMENT_IMAGE:-swr.cn-south-1.myhuaweicloud.com/jeepay/jeepay-payment:${VERSION}} container_name: jeepaypayment restart: always depends_on: @@ -275,7 +286,7 @@ services: # nginx 网关（对外映射 19216 / 19217 / 19218） BT_SERVICE_NAME6: - image: nginx:1.18.0 + image: ${NGINX_IMAGE:-swr.cn-south-1.myhuaweicloud.com/jeepay/nginx:1.18.0} container_name: nginx118 restart: always deploy: diff --git a/docs/deploy/baota.md b/docs/deploy/baota.md index a8d153f..cdae9cc 100644 --- a/docs/deploy/baota.md +++ b/docs/deploy/baota.md @@ -7,17 +7,50 @@ - 位置：仓库根目录 [`docker-compose.baota.yml`](../../docker-compose.baota.yml) - 宝塔应用模板引用该文件作为 `docker-compose` 部分即可 +## 镜像默认地址 + +所有业务镜像 + MySQL / Redis / RocketMQ / Nginx 默认走**华为云 SWR 公开仓库**（`swr.cn-south-1.myhuaweicloud.com/jeepay/*`），由计全官方维护，国内直拉不需要 Docker Hub 加速器。`alpine/git`（配置分发 init 容器）仍从 Docker Hub 拉（< 20MB，一次性）。 + +想改回 Docker Hub 上游镜像，可通过下面"可选环境变量"覆盖。 + ## 宝塔应用模板要声明的变量 +### 必须 + | 变量 | 用途 | 建议默认 | |---|---|---| -| `VERSION` | 业务镜像 tag（`jeepay/jeepay-manager` 等） | `3.2.0` | +| `VERSION` | 业务镜像 tag（`jeepay-manager` 等） | `3.2.0` | | `CONFIG_REF` | 配置源 git ref（与 `VERSION` 同版本的 tag 或 `master`） | 当前 release tag | | `APP_PATH` | 宿主部署根目录 | 宝塔默认 | | `HOST_IP` | 对外绑定 IP | 宝塔默认 | | `WEB_HTTP_PORT1` / `2` / `3` | 映射到容器 `19216` / `19217` / `19218` | `19216` / `19217` / `19218` | | `CPUS` / `MEMORY_LIMIT` | nginx 资源限制 | `1` / `512m` | +### 可选（改镜像源时覆盖） + +| 变量 | 默认 | +|---|---| +| `MYSQL_IMAGE` | `swr.cn-south-1.myhuaweicloud.com/jeepay/mysql:8.0.25` | +| `REDIS_IMAGE` | `swr.cn-south-1.myhuaweicloud.com/jeepay/redis:6.2.14` | +| `ROCKETMQ_IMAGE` | `swr.cn-south-1.myhuaweicloud.com/jeepay/rocketmq:5.3.1` | +| `NGINX_IMAGE` | `swr.cn-south-1.myhuaweicloud.com/jeepay/nginx:1.18.0` | +| `MANAGER_IMAGE` | `swr.cn-south-1.myhuaweicloud.com/jeepay/jeepay-manager:${VERSION}` | +| `MERCHANT_IMAGE` | `swr.cn-south-1.myhuaweicloud.com/jeepay/jeepay-merchant:${VERSION}` | +| `PAYMENT_IMAGE` | `swr.cn-south-1.myhuaweicloud.com/jeepay/jeepay-payment:${VERSION}` | +| `JEEPAY_CONFIGS_IMAGE` | `alpine/git:2.40`（Docker Hub） | + +**切回 Docker Hub 整套示例**： + +``` +MYSQL_IMAGE=mysql:8.0.25 +REDIS_IMAGE=redis:6.2.14 +ROCKETMQ_IMAGE=apache/rocketmq:5.3.1 +NGINX_IMAGE=nginx:1.18.0 +MANAGER_IMAGE=jeepay/jeepay-manager:3.2.0 +MERCHANT_IMAGE=jeepay/jeepay-merchant:3.2.0 +PAYMENT_IMAGE=jeepay/jeepay-payment:3.2.0 +``` + ## 安装后怎么改配置 配置文件都在 `${APP_PATH}/jeepayhomes/jeepayConfigs/` 下，**直接编辑即可**：