Skip to content

Commit ebefb0e

Browse files
hoorayman胡浩
andauthored
feat: docker-compose healthz check (flipped-aurora#1680)
Co-authored-by: 胡浩 <huhao@anesec.cn>
1 parent d4b9c2c commit ebefb0e

File tree

2 files changed

+28
-4
lines changed

2 files changed

+28
-4
lines changed

deploy/docker-compose/docker-compose-dev.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ services:
4141
ports:
4242
- '8888:8888'
4343
depends_on:
44-
- mysql
45-
- redis
44+
mysql:
45+
condition: service_healthy
46+
redis:
47+
condition: service_healthy
4648
volumes:
4749
- ../../server:/server
4850
working_dir: /server # 如果docker 设置了workdir 则此处不需要设置
@@ -67,6 +69,11 @@ services:
6769
MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
6870
MYSQL_USER: 'gva'
6971
MYSQL_PASSWORD: 'Aa@6447985'
72+
healthcheck:
73+
test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "gva", "-pAa@6447985"]
74+
interval: 10s
75+
timeout: 5s
76+
retries: 3
7077
volumes:
7178
- mysql:/var/lib/mysql
7279
networks:
@@ -80,6 +87,11 @@ services:
8087
restart: always
8188
ports:
8289
- '16379:6379'
90+
healthcheck:
91+
test: ["CMD-SHELL", "redis-cli ping | grep PONG || exit 1"]
92+
interval: 10s
93+
timeout: 5s
94+
retries: 3
8395
volumes:
8496
- redis:/data
8597
networks:

deploy/docker-compose/docker-compose.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ services:
3838
ports:
3939
- '8888:8888'
4040
depends_on:
41-
- mysql
42-
- redis
41+
mysql:
42+
condition: service_healthy
43+
redis:
44+
condition: service_healthy
4345
links:
4446
- mysql
4547
- redis
@@ -59,6 +61,11 @@ services:
5961
MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
6062
MYSQL_USER: 'gva'
6163
MYSQL_PASSWORD: 'Aa@6447985'
64+
healthcheck:
65+
test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "gva", "-pAa@6447985"]
66+
interval: 10s
67+
timeout: 5s
68+
retries: 3
6269
volumes:
6370
- mysql:/var/lib/mysql
6471
networks:
@@ -71,6 +78,11 @@ services:
7178
restart: always
7279
ports:
7380
- '16379:6379'
81+
healthcheck:
82+
test: ["CMD-SHELL", "redis-cli ping | grep PONG || exit 1"]
83+
interval: 10s
84+
timeout: 5s
85+
retries: 3
7486
volumes:
7587
- redis:/data
7688
networks:

0 commit comments

Comments
 (0)