From c0edfb629bdf4c1bd79cc2519ced4463b5ea81f1 Mon Sep 17 00:00:00 2001
From: zs <you@example.com>
Date: Mon, 2 Mar 2026 21:54:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=8E=E5=8F=B0=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/backend-deploy.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/backend-deploy.yml b/.gitea/workflows/backend-deploy.yml
index 8c2afd2..ca53160 100644
--- a/.gitea/workflows/backend-deploy.yml
+++ b/.gitea/workflows/backend-deploy.yml
@@ -40,7 +40,7 @@ jobs:
           HOST: 144.24.60.0
           KEY: ${{secrets.USAARMLOGIN_SSH_KEY}}
           ARGS: -avz --delete 
-          SSH_ARGS: "-p 22 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+          SSH_ARGS: "-p 22 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ServerAliveInterval=60 -o ServerAliveCountMax=3"
           SOURCE: ./deploy/
           TARGET: /var/admin/InsightReply/server/
           VERBOSE: true
@@ -54,7 +54,15 @@ jobs:
           script: |
             cd /var/admin/InsightReply/server
             sync
-            sleep 2
-            # 先停止容器以避免移除冲突，然后重新构建并启动 (使用 V2 版本的 docker compose)
-            docker compose down || true
-            docker compose up -d --build
+            sleep 5
+            # 检查是否有正在移除的容器，等待其完成
+            for i in {1..10}; do
+              if docker ps -a | grep -q "Removal In Progress"; then
+                echo "Waiting for container removal..."
+                sleep 2
+              else
+                break
+              fi
+            done
+            # 使用 --remove-orphans 更彻底地清理，并直接 build up
+            docker compose up -d --build --remove-orphans