From ff29cd66018ee8fdd9a2b2ecf16a8371a4c226a1 Mon Sep 17 00:00:00 2001
From: liubocheng <22913113@qq.com>
Date: Wed, 26 Mar 2025 21:34:01 +0800
Subject: [PATCH] =?UTF-8?q?dev:=E4=BF=AE=E6=94=B9=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy-dev.yml | 8 +++++---
 docker-compose.yml              | 6 ++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml
index b5c4fb0..3802720 100644
--- a/.gitea/workflows/deploy-dev.yml
+++ b/.gitea/workflows/deploy-dev.yml
@@ -61,11 +61,13 @@ jobs:
           /usr/bin/docker compose -p "${COMPOSE_PROJECT}" down --volumes || true
           /usr/bin/docker compose -p "${COMPOSE_PROJECT}" up -d --build
 
-          # 等待容器启动
-          sleep 15
+          # 等待 PHP 容器健康状态
+          while [ $(docker inspect --format "{{.State.Health.Status}}" ${COMPOSE_PROJECT}-php-1) != "healthy" ]; do
+            echo "等待 PHP 容器就绪..."
+            sleep 5
+          done
 
           docker exec "${COMPOSE_PROJECT}-php-1" composer install --no-dev --optimize-autoloader
           docker exec "${COMPOSE_PROJECT}-php-1" php artisan config:cache
-          docker exec "${COMPOSE_PROJECT}-php-1" php artisan migrate --force
           docker exec "${COMPOSE_PROJECT}-nginx-1" nginx -s reload
           EOF
diff --git a/docker-compose.yml b/docker-compose.yml
index 10099b2..c51515d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,12 @@ services:
       && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
       && composer install --no-dev --optimize-autoloader
       && php-fpm"
+    # 添加健康检查
+    healthcheck:
+      test: ["CMD", "test", "-f", "/var/www/html/vendor/autoload.php"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
 
   nginx:
     image: nginx:1.18