Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions docker/docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ services:
POSTGRES_DB: dso-console-db
POSTGRES_USER: admin
POSTGRES_PASSWORD: admin
healthcheck:
test: ["CMD-SHELL", "pg_isready -U admin -d dso-console-db"]
interval: 5s
timeout: 5s
retries: 10
networks:
- dso-network
attach: false
Expand All @@ -49,7 +54,7 @@ services:
user: root
depends_on:
postgres:
condition: service_started
condition: service_healthy
keycloak:
condition: service_healthy
volumes:
Expand All @@ -73,7 +78,7 @@ services:
container_name: dso-console_server-nestjs
depends_on:
postgres:
condition: service_started
condition: service_healthy
keycloak:
condition: service_healthy
opencds-mockoon:
Expand Down
9 changes: 7 additions & 2 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ services:
POSTGRES_DB: dso-console-db
POSTGRES_USER: admin
POSTGRES_PASSWORD: admin
healthcheck:
test: ["CMD-SHELL", "pg_isready -U admin -d dso-console-db"]
interval: 5s
timeout: 5s
retries: 10
ports:
- 5432:5432
volumes:
Expand Down Expand Up @@ -71,7 +76,7 @@ services:
keycloak:
condition: service_healthy
postgres:
condition: service_started
condition: service_healthy
ports:
- 4001:8080
- 9229:9229
Expand Down Expand Up @@ -123,7 +128,7 @@ services:
keycloak:
condition: service_healthy
postgres:
condition: service_started
condition: service_healthy
opencds-mockoon:
condition: service_healthy
env_file:
Expand Down
9 changes: 7 additions & 2 deletions docker/docker-compose.integ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ services:
POSTGRES_DB: dso-console-db
POSTGRES_USER: admin
POSTGRES_PASSWORD: admin
healthcheck:
test: ["CMD-SHELL", "pg_isready -U admin -d dso-console-db"]
interval: 5s
timeout: 5s
retries: 10
ports:
- 5432:5432
volumes:
Expand Down Expand Up @@ -45,7 +50,7 @@ services:
command: [dev]
depends_on:
postgres:
condition: service_started
condition: service_healthy
ports:
- 4001:8080
- 9229:9229
Expand Down Expand Up @@ -97,7 +102,7 @@ services:
command: [start:dev]
depends_on:
postgres:
condition: service_started
condition: service_healthy
opencds-mockoon:
condition: service_healthy
ports:
Expand Down
5 changes: 5 additions & 0 deletions docker/docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ services:
POSTGRES_DB: dso-console-db
POSTGRES_USER: admin
POSTGRES_PASSWORD: admin
healthcheck:
test: ["CMD-SHELL", "pg_isready -U admin -d dso-console-db"]
interval: 5s
timeout: 5s
retries: 10
ports:
- 5432:5432
volumes:
Expand Down
Loading