Merge branch 'refactor/preconfiguredImages' into version-1

gbn/docker-compose.yml

@@ -1,14 +1,12 @@
 version: '3.4'
 
 volumes:
-  store-db-data:
-    name: "store-db-data"
-  connector-db-data:
-    name: "connector-db-data"
+  gbn-connector-logs:
+  gbn-connector-db-data:
+  gbn-store-db-data:
 
 services:
   traefik:
-    container_name: bridgehead_traefik
     image: traefik:2.4
     command:
       - --api.insecure=true
@@ -23,7 +21,6 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
 
   landing:
-    container_name: bridgehead_landingpage
     image: nginx:stable
     volumes:
       - ../landing/:/usr/share/nginx/html
@@ -32,14 +29,53 @@ services:
       - "traefik.http.routers.landing.rule=PathPrefix(`/`)"
       - "traefik.http.services.landing.loadbalancer.server.port=80"
 
-  store:
-    container_name: "bridgehead_gbn_blaze_store"
+  gbn-connector:
+    image: "samply/share-client:gbn-feature-environmentPreconfigurationTorben"
+    environment:
+      POSTGRES_HOST: "gbn-connector-db"
+      POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS}
+      HTTP_PROXY_USER: ${HTTP_PROXY_USER}
+      HTTP_PROXY_PASSWORD: ${HTTP_PROXY_PASSWORD}
+      HTTPS_PROXY_USER: ${HTTPS_PROXY_USER}
+      HTTPS_PROXY_PASSWORD: ${HTTPS_PROXY_PASSWORD}
+      LDM_URL: "${PROTOCOL}://${HOST}:${PORT}/fhir"
+    env_file:
+      - ../site-config/gbn.env
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+      - "${HOST}:${HOSTIP}"
+    volumes:
+      - "gbn-connector-logs:/usr/local/tomcat/logs"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.gbn_connector.rule=PathPrefix(`/gbn-connector`)"
+      - "traefik.http.services.gbn_connector.loadbalancer.server.port=8080"
+    depends_on:
+      - "gbn-connector-db"
+    restart: "always"
+    env_file:
+    ###TODO: Move into Image
+      - internal.env
+
+  gbn-connector-db:
+    image: "postgres:10.17"
+    environment:
+      POSTGRES_DB: "samply.connector"
+      POSTGRES_USER: "samply"
+      POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS}
+    volumes:
+      - "gbn-connector-db-data:/var/lib/postgresql/data"
+    restart: "always"
+
+  gbn-store:
     image: "samply/blaze:0.15"
     environment:
-      BASE_URL: "http://bridgehead_gbn_blaze_store:8080"
+      BASE_URL: "${PROTOCOL}://${HOST}:${PORT}"
       JAVA_TOOL_OPTIONS: "-Xmx4g"
+    env_file:
+      - ../site-config/gbn.env
     volumes:
-      - "store-db-data:/app/data"
+      - "gbn-store-db-data:/app/data"
     labels:
       - "traefik.enable=true"
       - "traefik.http.middlewares.test-auth.basicauth.users=user:$$apr1$$RjhTX8\
@@ -49,48 +85,3 @@ services:
       - "traefik.http.services.blaze_gbn.loadbalancer.server.port=8080"
       - "traefik.http.routers.blaze_gbn.middlewares=gbn_b_strip,test-auth"
     restart: "always"
-
-  connector:
-    container_name: "bridgehead_gbn_connector"
-    image: "samply/share-client:gbn-7"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.gbn_connector.rule=PathPrefix(`/gbn-connector`)"
-      - "traefik.http.services.gbn_connector.loadbalancer.server.port=8080"
-    depends_on:
-      - "connector-db"
-    environment:
-      POSTGRES_PASS: ${CONNECTOR_POSTGRES_PASS}
-      POSTGRES_HOST: "bridgehead_gbn_connector_db"
-      MDR_URL: "https://mdr.germanbiobanknode.de/v3/api/mdr"
-      https_proxy: "http://www-int2.inet.dkfz-heidelberg.de:3128"
-      HTTP_PROXY_HOST: "http://www-int2.inet.dkfz-heidelberg.de:3128"
-      HTTPS_PROXY_HOST: "http://www-int2.inet.dkfz-heidelberg.de:3128"
-      HTTPS_PROXY_USER: ""
-      HTTP_PROXY_USER: ""
-      HTTPS_PROXY_PASSWORD: ""
-      HTTP_PROXY_PASSWORD: ""      
-      HTTP_PROXY: "http://www-int2.inet.dkfz-heidelberg.de:3128"
-      HTTPS_PROXY: "http://www-int2.inet.dkfz-heidelberg.de:3128"
-      http_proxy: "http://www-int2.inet.dkfz-heidelberg.de:3128"
-      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,address=65395,server=y,suspend=n"
-    ports:
-    - 65395:65395
-    restart: "always"
-    env_file:
-    ###TODO: Move into Image
-      - internal.env
-
-  connector-db:
-    container_name: "bridgehead_gbn_connector_db"
-    image: "postgres:10.17"
-    environment:
-      POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS}
-      POSTGRES_USER: "samply"
-      POSTGRES_DB: "samply.connector"
-      POSTGRES_PORT: 5432
-    volumes:
-      - "connector-db-data:/var/lib/postgresql/data"
-    ports:
-    - 5432:5432
-    restart: "always"