perf(ci): parallel image builds + pip cache

apps/worker/worker_app/core/config.py

@@ -17,7 +17,6 @@ class WorkerSettings(BaseSettings):
     database_pool_recycle: int = 3600
     environment: str = "development"
     auto_create_schema: bool = False
-    redis_url: str = "redis://redis:6379/0"
 
     # 渲染引擎选择：legacy=旧VideoComposeService，unified=新UnifiedRenderService
     render_engine: str = "legacy"

scripts/build_release_images.sh

@@ -17,6 +17,12 @@ case "$BUILD_ENV" in
 esac
 echo "Build environment: $BUILD_ENV → nginx config: $NGINX_CONF_FILE"
 
+# 可选：只构建指定镜像（api|worker|web），空则全部构建
+BUILD_ONLY="${BUILD_ONLY:-}"
+if [ -n "$BUILD_ONLY" ]; then
+  echo "Build mode: only $BUILD_ONLY"
+fi
+
 ROOT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)"
 cd "$ROOT_DIR"
 
@@ -60,26 +66,22 @@ fi
 # 默认只读不写，防止 feature 分支污染主缓存
 # 只有 develop/main 分支才写回缓存
 BRANCH_NAME="${GITHUB_REF_NAME:-${CI_COMMIT_BRANCH:-unknown}}"
-if [ "$USE_CACHE" -eq 1 ]; then
-  docker buildx build \
-    --build-arg APP_VERSION="$VERSION" \
-    --cache-from "type=registry,ref=${CACHE_REGISTRY}/api-cache:${CACHE_TAG},ignore-error=true" \
-    --cache-to "type=registry,ref=${CACHE_REGISTRY}/api-cache:${CACHE_TAG},mode=max" \
-    -f infra/docker/api.Dockerfile \
-    -t "$API_IMAGE" -t "$API_LATEST" \
-    --load \
-    .
-else
-  docker build --pull=false --build-arg APP_VERSION="$VERSION" -f infra/docker/api.Dockerfile -t "$API_IMAGE" -t "$API_LATEST" .
-fi
+case "$BRANCH_NAME" in
+  develop|main) CACHE_WRITE=1 ; echo "Cache mode: read+write (branch: $BRANCH_NAME)" ;;
+  *)            CACHE_WRITE=0 ; echo "Cache mode: read-only (branch: $BRANCH_NAME)" ;;
+esac
 
+# ---- 构建函数：使用 buildx 直接 push 到 registry ----
+# 不再使用 --load → docker tag → docker push 的串行方式
+# buildx --push 直接从 buildkit 推送，省去序列化导入 daemon 的开销
 build_with_cache() {
-  # usage: build_with_cache <image_name> <dockerfile> <extra_args...>
+  # usage: build_with_cache <image_name> <dockerfile> [extra_args...]
   IMG_NAME="$1"
   DOCKERFILE="$2"
   shift 2
   EXTRA_ARGS="$*"
 
+  REGISTRY_IMG="${REGISTRY}/xiaoxia-saas-${IMG_NAME}:$VERSION"
   CACHE_FROM="type=registry,ref=${CACHE_REGISTRY}/${IMG_NAME}-cache:${CACHE_TAG_PRIMARY},ignore-error=true"
 
   if [ "$CACHE_WRITE" -eq 1 ]; then
@@ -90,96 +92,100 @@ build_with_cache() {
     echo "  cache: read-only from ${CACHE_REGISTRY}/${IMG_NAME}-cache:${CACHE_TAG_PRIMARY}"
   fi
 
-  if [ "$USE_CACHE" -eq 1 ]; then
+  if [ "$USE_CACHE" -eq 1 ] && [ "$USE_PUSH" -eq 1 ]; then
     if [ -n "$CACHE_TO" ]; then
       docker buildx build \
         $EXTRA_ARGS \
         --cache-from "$CACHE_FROM" \
         --cache-to "$CACHE_TO" \
         -f "$DOCKERFILE" \
-        -t "$IMG_NAME:$VERSION" \
-        --load \
+        -t "$REGISTRY_IMG" \
+        --push \
         .
     else
       docker buildx build \
         $EXTRA_ARGS \
         --cache-from "$CACHE_FROM" \
         -f "$DOCKERFILE" \
-        -t "$IMG_NAME:$VERSION" \
-        --load \
+        -t "$REGISTRY_IMG" \
+        --push \
         .
     fi
+    echo "  ✅ Pushed: $REGISTRY_IMG"
   else
-    docker build --pull=false $EXTRA_ARGS -f "$DOCKERFILE" -t "$IMG_NAME:$VERSION" .
+    # 无push权限时，本地构建用于测试
+    docker build --pull=false $EXTRA_ARGS -f "$DOCKERFILE" -t "xiaoxia-saas-${IMG_NAME}:$VERSION" .
+    echo "  ✅ Built locally: xiaoxia-saas-${IMG_NAME}:$VERSION"
   fi
 }
 
-echo "=== Building API image ==="
-build_with_cache "api" "infra/docker/api.Dockerfile" \
-  "--build-arg APP_VERSION=$VERSION"
-docker tag "$API_IMAGE" "$API_LATEST"
+should_build() {
+  # usage: should_build <image_name>
+  # 返回0表示需要构建，1表示跳过
+  local img="$1"
+  if [ -z "$BUILD_ONLY" ]; then
+    return 0  # 全部构建
+  fi
+  if [ "$BUILD_ONLY" = "$img" ]; then
+    return 0
+  fi
+  return 1
+}
 
-echo "=== Building Worker image ==="
-if [ "$USE_CACHE" -eq 1 ]; then
-  docker buildx build \
-    --build-arg APP_VERSION="$VERSION" \
-    --cache-from "type=registry,ref=${CACHE_REGISTRY}/worker-cache:${CACHE_TAG},ignore-error=true" \
-    --cache-to "type=registry,ref=${CACHE_REGISTRY}/worker-cache:${CACHE_TAG},mode=max" \
-    -f infra/docker/worker.Dockerfile \
-    -t "$WORKER_IMAGE" -t "$WORKER_LATEST" \
-    --load \
-    .
-else
-  docker build --pull=false --build-arg APP_VERSION="$VERSION" -f infra/docker/worker.Dockerfile -t "$WORKER_IMAGE" -t "$WORKER_LATEST" .
+if should_build "api"; then
+  echo ""
+  echo "=== Building API image ==="
+  build_with_cache "api" "infra/docker/api.Dockerfile" \
+    "--build-arg APP_VERSION=$VERSION"
+
+  # 本地也打一个 :dev 标签方便本地引用（如果有本地镜像的话）
+  if [ "$USE_PUSH" -eq 0 ]; then
+    docker tag "$API_IMAGE" "$API_LATEST" 2>/dev/null || true
+  fi
 fi
 
-echo "=== Building Web image (with buildx cache) ==="
-# 先构建前端产物（使用持久化 npm 缓存卷）
-NPM_CACHE_VOLUME="xiaoxia-npm-cache"
-if ! docker volume inspect "$NPM_CACHE_VOLUME" >/dev/null 2>&1; then
-  docker volume create "$NPM_CACHE_VOLUME" >/dev/null
-  echo "  Created npm cache volume: $NPM_CACHE_VOLUME"
+if should_build "worker"; then
+  echo ""
+  echo "=== Building Worker image ==="
+  build_with_cache "worker" "infra/docker/worker.Dockerfile" \
+    "--build-arg APP_VERSION=$VERSION"
+
+  if [ "$USE_PUSH" -eq 0 ]; then
+    docker tag "$WORKER_IMAGE" "$WORKER_LATEST" 2>/dev/null || true
+  fi
 fi
 
-docker run --rm \
-  -v "$PWD:/workspace" \
-  -v "$NPM_CACHE_VOLUME:/workspace/apps/web/node_modules" \
-  -w /workspace/apps/web \
-  docker.m.daocloud.io/library/node:20 \
-  sh -lc "npm ci && npm run build"
+if should_build "web"; then
+  echo ""
+  echo "=== Building Web image ==="
+  # 先构建前端产物（使用持久化 npm 缓存卷）
+  NPM_CACHE_VOLUME="xiaoxia-npm-cache"
+  if ! docker volume inspect "$NPM_CACHE_VOLUME" >/dev/null 2>&1; then
+    docker volume create "$NPM_CACHE_VOLUME" >/dev/null
+    echo "  Created npm cache volume: $NPM_CACHE_VOLUME"
+  fi
 
-test -f apps/web/dist/index.html
+  docker run --rm \
+    -v "$PWD:/workspace" \
+    -v "$NPM_CACHE_VOLUME:/workspace/apps/web/node_modules" \
+    -w /workspace/apps/web \
+    docker.m.daocloud.io/library/node:20 \
+    sh -lc "npm ci && npm run build"
 
-if [ "$USE_CACHE" -eq 1 ]; then
-  docker buildx build \
-    --cache-from "type=registry,ref=${CACHE_REGISTRY}/web-cache:${CACHE_TAG},ignore-error=true" \
-    --cache-to "type=registry,ref=${CACHE_REGISTRY}/web-cache:${CACHE_TAG},mode=max" \
-    -f infra/docker/web-artifact.Dockerfile \
-    --build-arg "NGINX_CONF=$NGINX_CONF_FILE" \
-    -t "$WEB_IMAGE" \
-    --load \
-    .
-else
-  docker build --pull=false \
-    -f infra/docker/web-artifact.Dockerfile \
-    --build-arg "NGINX_CONF=$NGINX_CONF_FILE" \
-    -t "$WEB_IMAGE" \
-    .
-fi
+  test -f apps/web/dist/index.html
 
-# Push 到 Registry
-if [ "$USE_PUSH" -eq 1 ]; then
-  echo "=== Pushing images to Registry ==="
-  docker tag "$API_IMAGE" "$REGISTRY_API"
-  docker tag "$WORKER_IMAGE" "$REGISTRY_WORKER"
-  docker tag "$WEB_IMAGE" "$REGISTRY_WEB"
-  docker push "$REGISTRY_API"
-  docker push "$REGISTRY_WORKER"
-  docker push "$REGISTRY_WEB"
-  echo "All images pushed to $REGISTRY"
-else
-  echo "Registry push skipped (no auth token available)"
+  build_with_cache "web" "infra/docker/web-artifact.Dockerfile" \
+    "--build-arg NGINX_CONF=$NGINX_CONF_FILE"
 fi
 
+echo ""
 echo "=== Build complete ==="
-docker images | grep "xiaoxia-saas.*:$VERSION"
+if [ "$USE_PUSH" -eq 1 ]; then
+  echo "Images pushed to $REGISTRY:"
+  should_build "api" && echo "  - $REGISTRY_API"
+  should_build "worker" && echo "  - $REGISTRY_WORKER"
+  should_build "web" && echo "  - $REGISTRY_WEB"
+else
+  echo "Images built locally (registry push skipped)"
+  docker images | grep "xiaoxia-saas.*:$VERSION" || true
+fi

scripts/ci-deploy-production.sh

@@ -1,256 +0,0 @@
-#!/bin/sh
-# ============================================================
-# Production 部署脚本 - Registry 拉取方式
-# ============================================================
-# 原始位置：原内嵌在 .gitea/workflows/ci-cd.yml 的 deploy-production Job 中
-# 以 base64 编码存储在 DEPLOY_B64 变量中，通过 SSH 管道传送到服务器执行
-#
-# 功能：
-#   1. 登录 Gitea Registry
-#   2. Pull api / worker / web 三个镜像
-#   3. 备份旧前端静态资源（兼容 CDN 缓存，防止 404）
-#   4. 检查基础设施容器（PostgreSQL / Redis）
-#   5. 执行数据库 Migration
-#   6. 停止并重新启动三个业务容器
-#   7. 健康检查等待就绪
-#   8. 清理旧镜像
-#
-# 依赖的环境变量（由 CI 通过 SSH 传入）：
-#   IMAGE_TAG       - 镜像版本标签（如 v0.1.127，对应 git tag）
-#   REGISTRY_TOKEN  - Gitea Registry 访问令牌
-# ============================================================
-
-set -eu
-
-IMAGE_TAG="${IMAGE_TAG:-}"
-REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
-REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
-REGISTRY_TOKEN="${REGISTRY_TOKEN:-}"
-
-ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-production/.env}"
-GENERATED_DIR="${GENERATED_DIR:-/var/lib/xiaoxia-saas-production/generated}"
-LEGACY_ASSETS_DIR="${LEGACY_ASSETS_DIR:-/var/lib/xiaoxia-saas-production/legacy-assets}"
-
-if [ -z "$IMAGE_TAG" ]; then
-  echo "ERROR: IMAGE_TAG is required"
-  exit 1
-fi
-
-test -f "$ENV_FILE"
-mkdir -p "$GENERATED_DIR"
-mkdir -p "$LEGACY_ASSETS_DIR"
-
-# ---- 登录 Registry ----
-if [ -n "$REGISTRY_TOKEN" ]; then
-  echo "Logging in to registry: $REGISTRY"
-  REGISTRY_HOST=$(echo "$REGISTRY" | cut -d/ -f1)
-  printf %s "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin 2>/dev/null || {
-    echo "WARN: docker login failed, will try to pull anyway"
-  }
-fi
-
-# ---- Pull 三个镜像 ----
-REGISTRY_API="${REGISTRY}/xiaoxia-saas-api:${IMAGE_TAG}"
-REGISTRY_WORKER="${REGISTRY}/xiaoxia-saas-worker:${IMAGE_TAG}"
-REGISTRY_WEB="${REGISTRY}/xiaoxia-saas-web:${IMAGE_TAG}"
-
-LOCAL_API="xiaoxia-saas-api:${IMAGE_TAG}"
-LOCAL_WORKER="xiaoxia-saas-worker:${IMAGE_TAG}"
-LOCAL_WEB="xiaoxia-saas-web:${IMAGE_TAG}"
-
-echo "Pulling API image..."
-docker pull "$REGISTRY_API"
-echo "Pulling Worker image..."
-docker pull "$REGISTRY_WORKER"
-echo "Pulling Web image..."
-docker pull "$REGISTRY_WEB"
-
-# ---- Re-tag 成本地镜像名 ----
-docker tag "$REGISTRY_API" "$LOCAL_API"
-docker tag "$REGISTRY_WORKER" "$LOCAL_WORKER"
-docker tag "$REGISTRY_WEB" "$LOCAL_WEB"
-echo "All images pulled and tagged."
-
-# ---- 备份旧前端 assets（生产环境访问量大，防止 CDN 缓存命中 404） ----
-echo "Backing up legacy assets from current web container..."
-if docker inspect xiaoxia-web-production >/dev/null 2>&1; then
-  _tmpdir="/tmp/legacy-assets-$$"
-  rm -rf "$_tmpdir"
-  mkdir -p "$_tmpdir"
-  docker cp xiaoxia-web-production:/usr/share/nginx/html/assets/. "$_tmpdir/" 2>/dev/null || true
-  # 复制到 LEGACY_ASSETS_DIR（下一次部署时作为 fallback 挂载）
-  if [ -d "$_tmpdir" ] && [ "$(ls -A "$_tmpdir" 2>/dev/null)" ]; then
-    cp -an "$_tmpdir"/. "$LEGACY_ASSETS_DIR"/ 2>/dev/null || true
-    echo "Legacy assets backed up: $(ls "$_tmpdir" | wc -l) files"
-  fi
-  rm -rf "$_tmpdir"
-else
-  echo "No existing web container, skipping legacy assets backup"
-fi
-
-# 清理超过 7 天的旧 assets 文件
-if [ -d "$LEGACY_ASSETS_DIR" ]; then
-  find "$LEGACY_ASSETS_DIR" -type f -mtime +7 -delete 2>/dev/null || true
-  echo "Legacy assets cleanup done (retain 7 days)"
-fi
-
-# ---- 检查基础设施容器状态 ----
-echo "Checking infrastructure containers..."
-for c in xiaoxia-postgres-production xiaoxia-redis-production; do
-  if ! docker inspect "$c" >/dev/null 2>&1; then
-    echo "ERROR: Required container not found: $c"
-    exit 1
-  fi
-  state=$(docker inspect -f '{{.State.Status}}' "$c")
-  if [ "$state" != "running" ]; then
-    echo "ERROR: Container not running: $c ($state)"
-    exit 1
-  fi
-done
-
-# ---- 创建生产网络 ----
-docker network create xiaoxia-net-production 2>/dev/null || true
-
-# ---- 执行数据库 Migration ----
-echo "Running database migrations..."
-docker run --rm \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-production \
-  -e APP_ENV=production \
-  "$LOCAL_API" sh -c "cd /app && alembic upgrade head"
-echo "Migrations completed."
-
-# ---- 停止旧容器 ----
-echo "Stopping old containers..."
-docker rm -f xiaoxia-api-production 2>/dev/null || true
-docker rm -f xiaoxia-worker-production 2>/dev/null || true
-docker rm -f xiaoxia-web-production 2>/dev/null || true
-
-# ---- 启动参数（日志配置统一） ----
-LOG_OPTS="--log-driver json-file --log-opt max-size=50m --log-opt max-file=3"
-
-# ---- 启动 API 容器 ----
-echo "Starting API container..."
-docker run -d \
-  --name xiaoxia-api-production \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-production \
-  -p 127.0.0.1:8001:8000 \
-  -e APP_ENV=production \
-  -e APP_VERSION="$IMAGE_TAG" \
-  -e GENERATED_FILES_DIR=/app/generated \
-  -e GENERATED_FILES_URL_PREFIX=/generated-files \
-  -e PUBLIC_API_BASE_URL=https://api.xiaoxiajianji.com \
-  -v "$GENERATED_DIR:/app/generated" \
-  --restart unless-stopped \
-  --cpus 2 \
-  --memory 2g \
-  --health-cmd "python3 -c \"import urllib.request; urllib.request.urlopen('http://localhost:8000/health', timeout=5)\"" \
-  --health-interval 30s \
-  --health-timeout 10s \
-  --health-retries 3 \
-  --health-start-period 40s \
-  $LOG_OPTS \
-  "$LOCAL_API"
-
-# ---- 启动 Worker 容器 ----
-echo "Starting Worker container..."
-docker run -d \
-  --name xiaoxia-worker-production \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-production \
-  -e APP_ENV=production \
-  -e APP_VERSION="$IMAGE_TAG" \
-  -e WORKER_CONCURRENCY=1 \
-  -e WORKER_MAX_TASKS_PER_CHILD=100 \
-  -e GENERATED_FILES_DIR=/app/generated \
-  -e GENERATED_FILES_URL_PREFIX=/generated-files \
-  -e PUBLIC_API_BASE_URL=https://api.xiaoxiajianji.com \
-  -v "$GENERATED_DIR:/app/generated" \
-  --restart unless-stopped \
-  --cpus 2 \
-  --memory 2g \
-  --health-cmd "sh -c \"grep -q celery /proc/1/cmdline || exit 1\"" \
-  --health-interval 30s \
-  --health-timeout 10s \
-  --health-retries 3 \
-  --health-start-period 30s \
-  $LOG_OPTS \
-  "$LOCAL_WORKER"
-
-# ---- 启动 Web 容器 ----
-# Legacy assets 挂载到 /usr/share/nginx/html/assets-legacy/assets/
-# nginx 配置中 assets location 有 fallback 规则
-LEGACY_VOLUME=""
-if [ -d "$LEGACY_ASSETS_DIR" ] && [ "$(ls -A "$LEGACY_ASSETS_DIR" 2>/dev/null)" ]; then
-  LEGACY_VOLUME="-v ${LEGACY_ASSETS_DIR}:/usr/share/nginx/html/assets-legacy/assets:ro"
-  echo "Web container: legacy assets mounted (fallback)"
-else
-  echo "Web container: no legacy assets to mount"
-fi
-
-echo "Starting Web container..."
-docker run -d \
-  --name xiaoxia-web-production \
-  --network xiaoxia-net-production \
-  -p 127.0.0.1:3002:80 \
-  --restart unless-stopped \
-  --cpus 0.5 \
-  --memory 512m \
-  $LEGACY_VOLUME \
-  --health-cmd "wget --spider -q http://127.0.0.1:80" \
-  --health-interval 30s \
-  --health-timeout 5s \
-  --health-retries 3 \
-  $LOG_OPTS \
-  "$LOCAL_WEB"
-
-# ---- 等待 API 就绪 ----
-echo "Waiting for API to become healthy..."
-i=0
-while [ "$i" -lt 40 ]; do
-  if curl -sf --max-time 5 http://127.0.0.1:8001/health >/dev/null 2>&1; then
-    echo "API is healthy!"
-    break
-  fi
-  i=$((i + 1))
-  echo "  Waiting... ($i/40)"
-  sleep 3
-done
-
-if [ "$i" -ge 40 ]; then
-  echo "ERROR: API did not become healthy within 120s"
-  docker logs --tail 50 xiaoxia-api-production
-  exit 1
-fi
-
-# ---- 等待 Web 就绪 ----
-echo "Waiting for Web to become healthy..."
-i=0
-while [ "$i" -lt 15 ]; do
-  if curl -sf --max-time 5 http://127.0.0.1:3002/ >/dev/null 2>&1; then
-    echo "Web is healthy!"
-    break
-  fi
-  i=$((i + 1))
-  echo "  Waiting... ($i/15)"
-  sleep 2
-done
-
-if [ "$i" -ge 15 ]; then
-  echo "ERROR: Web did not become healthy within 30s"
-  docker logs --tail 30 xiaoxia-web-production
-  exit 1
-fi
-
-# ---- 清理旧镜像 ----
-echo "Cleaning up old images..."
-docker image prune -af --filter "until=168h" 2>/dev/null || true
-docker builder prune -af --filter "until=168h" 2>/dev/null || true
-
-echo ""
-echo "=== Production deployment complete ==="
-echo "API:      http://127.0.0.1:8001"
-echo "Web:      http://127.0.0.1:3002"
-echo "Version:  $IMAGE_TAG"
-docker ps --format "table {{.Names}}\t{{.Status}}\t{{.Image}}" | grep production

scripts/ci-deploy-staging.sh

@@ -1,219 +0,0 @@
-#!/bin/sh
-# ============================================================
-# Staging 部署脚本 - Registry 拉取方式（替代 Watchtower）
-# ============================================================
-# 说明：原 Staging 使用 Watchtower 轮询 :staging 标签自动更新
-# 本脚本替代 Watchtower，由 CI 主动触发部署，优势：
-#   - 部署时机精确可控，无需固定 sleep 等待
-#   - 部署完成立即健康检查，失败可快速回滚
-#   - 部署日志完整记录在 CI 中
-#
-# 功能：
-#   1. 登录 Gitea Registry
-#   2. Pull api / worker / web 三个镜像（用 commit SHA 作为 tag）
-#   3. 执行数据库 Migration
-#   4. 停止并重新启动三个业务容器
-#   5. 健康检查等待就绪
-#
-# 依赖的环境变量（由 CI 通过 SSH 传入）：
-#   IMAGE_TAG       - 镜像标签（一般为 commit SHA）
-#   REGISTRY_TOKEN  - Gitea Registry 访问令牌
-# ============================================================
-
-set -eu
-
-IMAGE_TAG="${IMAGE_TAG:-}"
-REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
-REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
-REGISTRY_TOKEN="${REGISTRY_TOKEN:-}"
-
-ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-staging/.env}"
-GENERATED_DIR="${GENERATED_DIR:-/var/lib/xiaoxia-saas-staging/generated}"
-
-if [ -z "$IMAGE_TAG" ]; then
-  echo "ERROR: IMAGE_TAG is required"
-  exit 1
-fi
-
-test -f "$ENV_FILE"
-mkdir -p "$GENERATED_DIR"
-
-# ---- 登录 Registry ----
-if [ -n "$REGISTRY_TOKEN" ]; then
-  echo "Logging in to registry: $REGISTRY"
-  REGISTRY_HOST=$(echo "$REGISTRY" | cut -d/ -f1)
-  printf %s "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin 2>/dev/null || {
-    echo "WARN: docker login failed, will try to pull anyway"
-  }
-fi
-
-# ---- Pull 三个镜像 ----
-REGISTRY_API="${REGISTRY}/xiaoxia-saas-api:${IMAGE_TAG}"
-REGISTRY_WORKER="${REGISTRY}/xiaoxia-saas-worker:${IMAGE_TAG}"
-REGISTRY_WEB="${REGISTRY}/xiaoxia-saas-web:${IMAGE_TAG}"
-
-LOCAL_API="xiaoxia-saas-api:staging-${IMAGE_TAG}"
-LOCAL_WORKER="xiaoxia-saas-worker:staging-${IMAGE_TAG}"
-LOCAL_WEB="xiaoxia-saas-web:staging-${IMAGE_TAG}"
-
-echo "Pulling API image..."
-docker pull "$REGISTRY_API"
-echo "Pulling Worker image..."
-docker pull "$REGISTRY_WORKER"
-echo "Pulling Web image..."
-docker pull "$REGISTRY_WEB"
-
-# ---- Re-tag 成本地镜像名 ----
-docker tag "$REGISTRY_API" "$LOCAL_API"
-docker tag "$REGISTRY_WORKER" "$LOCAL_WORKER"
-docker tag "$REGISTRY_WEB" "$LOCAL_WEB"
-echo "All images pulled and tagged."
-
-# ---- 检查基础设施容器 ----
-echo "Checking infrastructure containers..."
-for c in xiaoxia-postgres-staging xiaoxia-redis-staging; do
-  if ! docker inspect "$c" >/dev/null 2>&1; then
-    echo "ERROR: Required container not found: $c"
-    exit 1
-  fi
-  state=$(docker inspect -f '{{.State.Status}}' "$c")
-  if [ "$state" != "running" ]; then
-    echo "ERROR: Container not running: $c ($state)"
-    exit 1
-  fi
-done
-
-# ---- 创建 Staging 网络 ----
-docker network create xiaoxia-net-staging 2>/dev/null || true
-
-# ---- 执行数据库 Migration ----
-echo "Running database migrations..."
-docker run --rm \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-staging \
-  -e APP_ENV=staging \
-  "$LOCAL_API" sh -c "cd /app && alembic upgrade head"
-echo "Migrations completed."
-
-# ---- 停止旧容器 ----
-echo "Stopping old containers..."
-docker rm -f xiaoxia-api-staging 2>/dev/null || true
-docker rm -f xiaoxia-worker-staging 2>/dev/null || true
-docker rm -f xiaoxia-web-staging 2>/dev/null || true
-
-# ---- 启动参数（日志配置统一） ----
-LOG_OPTS="--log-driver json-file --log-opt max-size=50m --log-opt max-file=3"
-
-# ---- 启动 API 容器 ----
-echo "Starting API container..."
-docker run -d \
-  --name xiaoxia-api-staging \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-staging \
-  -p 127.0.0.1:8000:8000 \
-  -e APP_ENV=staging \
-  -e APP_VERSION="$IMAGE_TAG" \
-  -e GENERATED_FILES_DIR=/app/generated \
-  -e GENERATED_FILES_URL_PREFIX=/generated-files \
-  -e PUBLIC_API_BASE_URL=https://staging-api.xiaoxiajianji.com \
-  -v "$GENERATED_DIR:/app/generated" \
-  --restart unless-stopped \
-  --cpus 1 \
-  --memory 1g \
-  --health-cmd "python3 -c \"import urllib.request; urllib.request.urlopen('http://localhost:8000/health', timeout=5)\"" \
-  --health-interval 30s \
-  --health-timeout 10s \
-  --health-retries 3 \
-  --health-start-period 30s \
-  $LOG_OPTS \
-  "$LOCAL_API"
-
-# ---- 启动 Worker 容器 ----
-echo "Starting Worker container..."
-docker run -d \
-  --name xiaoxia-worker-staging \
-  --env-file "$ENV_FILE" \
-  --network xiaoxia-net-staging \
-  -e APP_ENV=staging \
-  -e APP_VERSION="$IMAGE_TAG" \
-  -e WORKER_CONCURRENCY=1 \
-  -e WORKER_MAX_TASKS_PER_CHILD=100 \
-  -e GENERATED_FILES_DIR=/app/generated \
-  -e GENERATED_FILES_URL_PREFIX=/generated-files \
-  -e PUBLIC_API_BASE_URL=https://staging-api.xiaoxiajianji.com \
-  -v "$GENERATED_DIR:/app/generated" \
-  --restart unless-stopped \
-  --cpus 1 \
-  --memory 1g \
-  --health-cmd "sh -c \"grep -q celery /proc/1/cmdline || exit 1\"" \
-  --health-interval 30s \
-  --health-timeout 10s \
-  --health-retries 3 \
-  --health-start-period 30s \
-  $LOG_OPTS \
-  "$LOCAL_WORKER"
-
-# ---- 启动 Web 容器 ----
-echo "Starting Web container..."
-docker run -d \
-  --name xiaoxia-web-staging \
-  --network xiaoxia-net-staging \
-  -p 127.0.0.1:3001:80 \
-  --restart unless-stopped \
-  --cpus 0.5 \
-  --memory 256m \
-  --health-cmd "wget --spider -q http://127.0.0.1:80" \
-  --health-interval 30s \
-  --health-timeout 5s \
-  --health-retries 3 \
-  $LOG_OPTS \
-  "$LOCAL_WEB"
-
-# ---- 等待 API 就绪 ----
-echo "Waiting for API to become healthy..."
-i=0
-while [ "$i" -lt 30 ]; do
-  if curl -sf --max-time 5 http://127.0.0.1:8000/health >/dev/null 2>&1; then
-    echo "API is healthy!"
-    break
-  fi
-  i=$((i + 1))
-  echo "  Waiting... ($i/30)"
-  sleep 2
-done
-
-if [ "$i" -ge 30 ]; then
-  echo "ERROR: API did not become healthy within 60s"
-  docker logs --tail 50 xiaoxia-api-staging
-  exit 1
-fi
-
-# ---- 等待 Web 就绪 ----
-echo "Waiting for Web to become healthy..."
-i=0
-while [ "$i" -lt 15 ]; do
-  if curl -sf --max-time 5 http://127.0.0.1:3001/ >/dev/null 2>&1; then
-    echo "Web is healthy!"
-    break
-  fi
-  i=$((i + 1))
-  echo "  Waiting... ($i/15)"
-  sleep 2
-done
-
-if [ "$i" -ge 15 ]; then
-  echo "ERROR: Web did not become healthy within 30s"
-  docker logs --tail 30 xiaoxia-web-staging
-  exit 1
-fi
-
-# ---- 清理旧镜像 ----
-echo "Cleaning up old images..."
-docker image prune -af --filter "until=72h" 2>/dev/null || true
-
-echo ""
-echo "=== Staging deployment complete ==="
-echo "API:      http://127.0.0.1:8000"
-echo "Web:      http://127.0.0.1:3001"
-echo "Version:  $IMAGE_TAG"
-docker ps --format "table {{.Names}}\t{{.Status}}\t{{.Image}}" | grep staging