更新docker-compose,修正容器启动顺序依赖

This commit is contained in:
Easy 2022-03-23 12:28:05 +08:00
parent 9afddbfddb
commit b39c92c42d
2 changed files with 22 additions and 6 deletions

View File

@ -1,7 +1,11 @@
version: '2' version: '2.1'
services: services:
mariadb: mariadb:
image: 'mariadb:10.5.8-focal' image: 'mariadb:10.5.8-focal'
healthcheck:
test: ["CMD", "mysqladmin", "ping", "--silent","--password=$$MYSQL_ROOT_PASSWORD"]
timeout: 10s
retries: 3
volumes: volumes:
- 'mariadb_data:/var/lib/mysql' - 'mariadb_data:/var/lib/mysql'
environment: environment:
@ -11,6 +15,8 @@ services:
- '3306:3306' - '3306:3306'
redis: redis:
image: 'bitnami/redis:6.0.16' image: 'bitnami/redis:6.0.16'
healthcheck:
test: ["CMD", "redis-cli","ping"]
environment: environment:
- ALLOW_EMPTY_PASSWORD=yes - ALLOW_EMPTY_PASSWORD=yes
app: app:
@ -21,8 +27,10 @@ services:
volumes: volumes:
- './:/app' - './:/app'
depends_on: depends_on:
- mariadb mariadb:
- redis condition: service_healthy
redis:
condition: service_healthy
environment: environment:
- DB_HOST=mariadb - DB_HOST=mariadb
- DB_PORT=3306 - DB_PORT=3306

View File

@ -1,7 +1,11 @@
version: '2' version: '2.1'
services: services:
mariadb: mariadb:
image: 'mariadb:10.5.8-focal' image: 'mariadb:10.5.8-focal'
healthcheck:
test: ["CMD", "mysqladmin", "ping", "--silent","--password=$$MYSQL_ROOT_PASSWORD"]
timeout: 10s
retries: 3
volumes: volumes:
- 'mariadb_data:/var/lib/mysql' - 'mariadb_data:/var/lib/mysql'
environment: environment:
@ -11,6 +15,8 @@ services:
- '3306:3306' - '3306:3306'
redis: redis:
image: 'bitnami/redis:6.0.16' image: 'bitnami/redis:6.0.16'
healthcheck:
test: ["CMD", "redis-cli","ping"]
environment: environment:
- ALLOW_EMPTY_PASSWORD=yes - ALLOW_EMPTY_PASSWORD=yes
app: app:
@ -21,8 +27,10 @@ services:
volumes: volumes:
- './:/app' - './:/app'
depends_on: depends_on:
- mariadb mariadb:
- redis condition: service_healthy
redis:
condition: service_healthy
environment: environment:
- DB_HOST=mariadb - DB_HOST=mariadb
- DB_PORT=3306 - DB_PORT=3306