From dfb39cd8831d6403103a1f127daf826e77f6dc5d Mon Sep 17 00:00:00 2001 From: ileko Date: Sun, 7 May 2023 17:38:38 +0200 Subject: [PATCH] Fix docker compose services startup --- docker/docker-compose.build.yml | 15 +++++++++++++++ docker/docker-compose.yml | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/docker/docker-compose.build.yml b/docker/docker-compose.build.yml index 1b552b9a3..4e3e38254 100644 --- a/docker/docker-compose.build.yml +++ b/docker/docker-compose.build.yml @@ -11,16 +11,31 @@ services: REDIS_PASSWORD: ${REDIS_PASSWORD} ports: - 3333:3333 + depends_on: + postgres: + condition: service_healthy + redis: + condition: service_healthy postgres: image: postgres:12 env_file: - ../.env + healthcheck: + test: [ "CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] + interval: 10s + timeout: 5s + retries: 5 volumes: - postgres:/var/lib/postgresql/data redis: image: 'redis:alpine' + healthcheck: + test: ["CMD-SHELL","redis-cli ping | grep PONG"] + interval: 10s + timeout: 5s + retries: 5 volumes: postgres: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 66b08748e..212f61a2e 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -11,16 +11,31 @@ services: REDIS_PASSWORD: ${REDIS_PASSWORD} ports: - 3333:3333 + depends_on: + postgres: + condition: service_healthy + redis: + condition: service_healthy postgres: image: postgres:12 env_file: - ../.env + healthcheck: + test: [ "CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] + interval: 10s + timeout: 5s + retries: 5 volumes: - postgres:/var/lib/postgresql/data redis: image: 'redis:alpine' + healthcheck: + test: ["CMD-SHELL","redis-cli ping | grep PONG"] + interval: 10s + timeout: 5s + retries: 5 volumes: postgres: