From 219c83315723ab4868fa511fb0485cce89f2afef Mon Sep 17 00:00:00 2001
From: Kevin <kevin@brighteng.org>
Date: Mon, 11 May 2026 10:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=BF=9C=E7=AB=AF=20SSH=20=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E5=8A=A0=E4=BA=86=20keepalive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-build-deploy.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-build-deploy.yml b/.github/workflows/docker-build-deploy.yml
index 06b1b92..f291661 100644
--- a/.github/workflows/docker-build-deploy.yml
+++ b/.github/workflows/docker-build-deploy.yml
@@ -241,7 +241,7 @@ jobs:
           echo "$ALIYUN_CR_PASSWORD" | ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" \
             "docker login $REGISTRY --username=$ALIYUN_CR_USERNAME --password-stdin"
 
-          ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" "
+          ssh -o ServerAliveInterval=30 -o ServerAliveCountMax=6 -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" "
             set -euo pipefail
             mkdir -p '$COMPOSE_DIR/api'
             mkdir -p '$COMPOSE_DIR/api/backups'
@@ -275,7 +275,7 @@ jobs:
           scp -P "$SSH_PORT" ./api/docker-compose.yml "$SSH_USER@$SSH_HOST:$COMPOSE_DIR/api/docker-compose.candidate.yml"
           scp -P "$SSH_PORT" "$ENV_SRC" "$SSH_USER@$SSH_HOST:$COMPOSE_DIR/api/.env.candidate"
 
-          ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" "
+          ssh -o ServerAliveInterval=30 -o ServerAliveCountMax=6 -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" "
             set -euo pipefail
             cd '$COMPOSE_DIR/api'
             echo '拉取候选镜像: $IMAGE_TAG'
@@ -291,7 +291,7 @@ jobs:
         run: |
           set -euo pipefail
           echo "切换线上版本，容器启动时将自动执行 Alembic..."
-          ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" "
+          ssh -o ServerAliveInterval=30 -o ServerAliveCountMax=6 -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" "
             set -euo pipefail
             cd '$COMPOSE_DIR/api'
             if [ -f '$COMPOSE_FILE' ]; then
@@ -316,9 +316,7 @@ jobs:
               docker compose -f '$COMPOSE_FILE' logs --tail=80 celery-worker || true
               exit 1
             fi
-            echo '等待服务启动...'
-            sleep 20
-            docker image prune -f || true
+            echo '服务已启动，输出当前状态...'
             docker compose -f '$COMPOSE_FILE' ps
           "