From 6297ea663459c4e7cef86410247908ad30673d0b Mon Sep 17 00:00:00 2001
From: yml2213 <a2213290201@gmail.com>
Date: Fri, 6 Nov 2026 18:26:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(deploy):=20=E9=BB=98=E8=AE=A4=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E6=9C=AC=E5=9C=B0=E5=9F=BA=E7=A1=80=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/README.md         |  1 +
 deploy/scripts/deploy.sh | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/deploy/README.md b/deploy/README.md
index 501a122..7188b3b 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -102,6 +102,7 @@ chmod +x deploy/scripts/*.sh
 ./deploy/scripts/deploy.sh --status    # 状态
 ./deploy/scripts/deploy.sh --down      # 停容器（保留卷）
 ./deploy/scripts/deploy.sh --seed-only # 仅跑种子
+./deploy/scripts/deploy.sh --pull      # 更新基础镜像后重新构建
 ./deploy/scripts/backup-db.sh          # 备份数据库到 ./backups
 
 docker compose -f docker-compose.prod.yml --env-file deploy/.env.prod logs -f api
diff --git a/deploy/scripts/deploy.sh b/deploy/scripts/deploy.sh
index ff0feb7..2e4948f 100755
--- a/deploy/scripts/deploy.sh
+++ b/deploy/scripts/deploy.sh
@@ -2,7 +2,8 @@
 # 客服云 — 腾讯云 / 任意 Linux 一键生产部署
 # 默认 HTTP_PORT=18080，避免与宿主机 Caddy(80/443) 冲突；见 deploy/caddy/Caddyfile.example
 # 用法：
-#   ./deploy/scripts/deploy.sh              # 构建并启动
+#   ./deploy/scripts/deploy.sh              # 构建并启动（使用本地基础镜像）
+#   ./deploy/scripts/deploy.sh --pull       # 先更新基础镜像再构建启动
 #   ./deploy/scripts/deploy.sh --seed       # 启动后导入演示账号数据
 #   ./deploy/scripts/deploy.sh --pull-only  # 仅 pull/up，不强制 rebuild（需已有镜像）
 #   ./deploy/scripts/deploy.sh --down       # 停止并移除容器（保留数据卷）
@@ -251,11 +252,12 @@ print_summary() {
 }
 
 cmd_up() {
-  local seed=0 rebuild=1
+  local seed=0 rebuild=1 pull=0
   while [[ $# -gt 0 ]]; do
     case "$1" in
       --seed) seed=1 ;;
-      --pull-only) rebuild=0 ;;
+      --pull) pull=1 ;;
+      --pull-only) pull=1; rebuild=0 ;;
       *) ;;
     esac
     shift
@@ -271,8 +273,12 @@ cmd_up() {
   ensure_env
   ensure_geoip
 
-  log "拉取基础镜像…"
-  compose pull postgres minio minio-init || true
+  if [[ "$pull" -eq 1 ]]; then
+    log "拉取基础镜像…"
+    compose pull postgres minio minio-init || true
+  else
+    log "使用本地基础镜像（需要更新时追加 --pull）"
+  fi
 
   if [[ "$rebuild" -eq 1 ]]; then
     log "构建并启动全部服务（api + web + db + minio）…"