feat: docker-compose healthz check (#1680)

Co-authored-by: 胡浩 <huhao@anesec.cn>
flipped-aurora · Mar 20, 2024 · ebefb0e · ebefb0e
1 parent d4b9c2c
commit ebefb0e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/deploy/docker-compose/docker-compose-dev.yaml b/deploy/docker-compose/docker-compose-dev.yaml
@@ -41,8 +41,10 @@ services:
     ports:
       - '8888:8888'
     depends_on:
-      - mysql
-      - redis
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     volumes:
       - ../../server:/server
     working_dir: /server    # 如果docker 设置了workdir 则此处不需要设置 
@@ -67,6 +69,11 @@ services:
       MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
       MYSQL_USER: 'gva'
       MYSQL_PASSWORD: 'Aa@6447985'
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "gva", "-pAa@6447985"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
     volumes:
       - mysql:/var/lib/mysql
     networks:
@@ -80,6 +87,11 @@ services:
     restart: always
     ports:
       - '16379:6379'
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli ping | grep PONG || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
     volumes:
       - redis:/data
     networks:

diff --git a/deploy/docker-compose/docker-compose.yaml b/deploy/docker-compose/docker-compose.yaml
@@ -38,8 +38,10 @@ services:
     ports:
       - '8888:8888'
     depends_on:
-      - mysql
-      - redis
+      mysql:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     links:
       - mysql
       - redis
@@ -59,6 +61,11 @@ services:
       MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
       MYSQL_USER: 'gva'
       MYSQL_PASSWORD: 'Aa@6447985'
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "gva", "-pAa@6447985"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
     volumes:
       - mysql:/var/lib/mysql
     networks:
@@ -71,6 +78,11 @@ services:
     restart: always
     ports:
       - '16379:6379'
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli ping | grep PONG || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
     volumes:
       - redis:/data
     networks: