From b7d137247a5ac5d318bf325e1532d37767433925 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Tue, 11 Feb 2025 10:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20docker=20=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/docker-compose.yaml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml
index cfb056af..5fc24fb5 100644
--- a/deploy/docker-compose.yaml
+++ b/deploy/docker-compose.yaml
@@ -15,6 +15,11 @@ services:
       - ./data/mysql/data:/var/lib/mysql
       - ./logs/mysql:/var/log/mysql
       - ./data/mysql/init.d:/docker-entrypoint-initdb.d/
+    healthcheck:
+      test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
+      interval: 5s
+      timeout: 10s
+      retries: 10
 
   # redis
   geekai-redis:
@@ -26,6 +31,11 @@ services:
       - ./data/redis:/data
     ports:
       - "6380:6379"
+    healthcheck:
+      test: [ "CMD", "redis-cli", "ping" ]
+      interval: 3s
+      timeout: 10s
+      retries: 5
 
 #  xxl-job-admin:
 #    container_name: geekai-xxl-job-admin
@@ -62,8 +72,10 @@ services:
     container_name: geekai-api
     restart: always
     depends_on:
-      - geekai-mysql
-      - geekai-redis
+      geekai-mysql:
+        condition: service_healthy
+      geekai-redis:
+        condition: service_healthy
     environment:
       - DEBUG=false
       - LOG_LEVEL=info