diff --git a/deploy/docker-compose.prod.yml b/deploy/docker-compose.prod.yml index 54b88f8d..7d805e0b 100644 --- a/deploy/docker-compose.prod.yml +++ b/deploy/docker-compose.prod.yml @@ -40,7 +40,8 @@ services: memory: 128M cpus: '0.25' depends_on: - - backend + backend: + condition: service_healthy mysql: image: mysql:8.4 @@ -56,16 +57,17 @@ services: deploy: resources: limits: - memory: 2G + memory: 3G cpus: '2.0' reservations: - memory: 512M + memory: 1G cpus: '1.0' healthcheck: test: ["CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -uroot -p\"$${MYSQL_ROOT_PASSWORD}\""] interval: 10s - timeout: 5s - retries: 10 + timeout: 10s + retries: 12 + start_period: 30s redis: image: redis:7.4-alpine diff --git a/scripts/deploy-prod.sh b/scripts/deploy-prod.sh index 1bf81b2d..e08bc6cd 100755 --- a/scripts/deploy-prod.sh +++ b/scripts/deploy-prod.sh @@ -747,8 +747,8 @@ main() { fi if [[ "${NO_BUILD}" == "1" ]]; then - log "启动生产服务..." - compose up -d + log "启动基础设施服务..." + compose up -d mysql redis ocr else log "清理旧镜像以释放空间..." docker image prune -f 2>/dev/null || true @@ -762,13 +762,18 @@ main() { log "构建 OCR sidecar 镜像..." compose build ocr - log "启动生产服务..." - compose up -d --no-build --remove-orphans + log "启动基础设施服务..." + compose up -d mysql redis ocr fi + # 先等基础依赖稳定,再启动后端和网关,避免 MySQL 瞬时健康检查失败 + # 把 backend/caddy 留在 Created 状态并导致整站不可用。 wait_service_healthy mysql "MySQL" wait_service_healthy redis "Redis" wait_service_healthy ocr "OCR sidecar" + + log "启动应用服务..." + compose up -d --no-build --remove-orphans wait_service_healthy caddy "Caddy" ensure_mysql_backup_user reset_database