Skip to content

Commit

Permalink
started compose fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Severin Kohler committed Mar 20, 2024
1 parent dfdd745 commit fea9978
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 16 deletions.
6 changes: 4 additions & 2 deletions setup/docker-compose-eos+cdm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,22 @@ services:
# expose:
# - "5433" # Publishes 5433 to other containers but NOT to host machine
ports:
- "5433:5432"
- "5433:5433"
healthcheck:
test: "pg_isready -q -h localhost"
interval: 10s
timeout: 5s
retries: 70

eos:
image: ghcr.io/sevkohler/eos:latest
volumes:
- ../src/main/resources/application.yml:/workspace/BOOT-INF/classes/application.yml
environment:
DB_URL: jdbc:postgresql://localhost:5433/postgres
DB_URL: jdbc:postgresql://localhost:5432/postgres
ports:
- "8081:8081"
depends_on:
cdm-db:
condition: service_healthy
network_mode: "host"
30 changes: 16 additions & 14 deletions setup/docker-compose-full.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#docker-compose-full.yml
#https://github.com/docker-library/postgres/issues/146
services:

cdm-db:
image: cdm_db:latest
build:
Expand All @@ -18,6 +19,19 @@ services:
interval: 10s
timeout: 5s
retries: 70

eos:
image: ghcr.io/sevkohler/eos:latest
volumes:
- ../src/main/resources/application.yml:/workspace/BOOT-INF/classes/application.yml
environment:
DB_URL: jdbc:postgresql://localhost:5433/postgres
ports:
- "8081:8081"
depends_on:
cdm-db:
condition: service_healthy

ehrbase:
image: ehrbase/ehrbase:next
ports:
Expand Down Expand Up @@ -53,18 +67,6 @@ services:
EHRBASE_USER: ehrbase_restricted
EHRBASE_PASSWORD: ehrbase_restricted

eos:
image: ghcr.io/sevkohler/eos:latest
volumes:
- ../src/main/resources/application.yml:/workspace/BOOT-INF/classes/application.yml
environment:
DB_URL: jdbc:postgresql://localhost:5433/postgres
ports:
- "8081:8081"
depends_on:
cdm-db:
condition: service_healthy
networks:
ehrbase-network: { }


networks:
ehrbase-net: {}

0 comments on commit fea9978

Please sign in to comment.