From fea9978cd97627c379c9eb120982941ebef7ca47 Mon Sep 17 00:00:00 2001
From: Severin Kohler <severin.kohler@charite.de>
Date: Wed, 20 Mar 2024 17:02:13 +0100
Subject: [PATCH] started compose fix

---
 setup/docker-compose-eos+cdm.yml |  6 ++++--
 setup/docker-compose-full.yml    | 30 ++++++++++++++++--------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/setup/docker-compose-eos+cdm.yml b/setup/docker-compose-eos+cdm.yml
index 91f23b2..f1d617c 100644
--- a/setup/docker-compose-eos+cdm.yml
+++ b/setup/docker-compose-eos+cdm.yml
@@ -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"
\ No newline at end of file
diff --git a/setup/docker-compose-full.yml b/setup/docker-compose-full.yml
index 1dbbac1..a2c049e 100644
--- a/setup/docker-compose-full.yml
+++ b/setup/docker-compose-full.yml
@@ -1,6 +1,7 @@
 #docker-compose-full.yml
 #https://github.com/docker-library/postgres/issues/146
 services:
+
   cdm-db:
     image: cdm_db:latest
     build:
@@ -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:
@@ -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: {}