From c71ea29f54788235d97f99bf590b968fe0cc983b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=BD=E5=93=92=E5=93=92?=
 <shuangdada@shuangdadadeMacBook-Pro.local>
Date: Wed, 18 Mar 2026 23:21:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=92=8C=E5=BC=BA=E5=88=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yaml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 4b08f24..2ce8c46 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -4,6 +4,7 @@ on: [push]
 jobs:
   deploy:
     runs-on: ubuntu
+    timeout-minutes: 30
     steps:
       - name: Deploy using SSH
         # 使用 Gitea 官方镜像源，加速国内访问
@@ -34,8 +35,12 @@ jobs:
 
             # 3. 停止并移除 Docker 容器及镜像
             echo -e "\n===== 停止并清理 Docker ====="
-            # 移除 --rmi all，保留镜像缓存，加快构建速度，同时避免误删基础镜像
-            echo $SUDO_PASSWORD | sudo -S docker compose down
+            # 强制停止并删除容器，忽略错误
+            echo $SUDO_PASSWORD | sudo -S docker compose down --remove-orphans 2>/dev/null || true
+            # 等待容器完全停止
+            sleep 5
+            # 强制删除可能残留的容器
+            echo $SUDO_PASSWORD | sudo -S docker ps -aq --filter "name=scoring" | xargs -r docker rm -f 2>/dev/null || true
 
             # 4. 拉取 Git 最新代码
             echo -e "\n===== 拉取 Git 代码 ====="
@@ -65,6 +70,14 @@ jobs:
 
             # 6. 重新启动 Docker 容器
             echo -e "\n===== 启动 Docker 容器 ====="
-            echo $SUDO_PASSWORD | sudo -S docker compose up -d --build
+            echo $SUDO_PASSWORD | sudo -S docker compose up -d --build --quiet-pull
+
+            # 7. 等待服务启动
+            echo -e "\n===== 等待服务启动 ====="
+            sleep 15
+
+            # 8. 检查服务状态
+            echo -e "\n===== 检查服务状态 ====="
+            echo $SUDO_PASSWORD | sudo -S docker compose ps
 
             echo -e "\n===== 操作完成！====="