Some more adjustments for dktk

gbn/docker-compose.yml

@@ -15,11 +15,6 @@ services:
       - --entrypoints.web.address=:80
       - --entrypoints.web-secure.address=:443
       - --providers.docker=true
-    environment:
-      http_proxy: ""
-      HTTP_PROXY: ""
-      https_proxy: ""
-      HTTPS_PROXY: ""      
     ports:
       - 80:80
       - 443:443
@@ -58,31 +53,44 @@ services:
   connector:
     container_name: "bridgehead_gbn_connector"
     image: "samply/share-client:gbn-7"
-    environment:
-      POSTGRES_HOST: "bridgehead_gbn_connector_db"
-      POSTGRES_PASS: ${CONNECTOR_POSTGRES_PASS}
-      POSTGRES_PORT: 5432
-      STORE_URL: "http://bridgehead_gbn_blaze_store:8080/fhir"
-    env_file:
-    ###TODO: Move into Image
-      - internal.env
     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"
-    restart: "always"
-    env_file:
-    ###TODO: Move into Image
-      - internal.env
+    ports:
+    - 5432:5432
+    restart: "always"

gbn/gbn.env.dev

@@ -1,64 +0,0 @@
-SITE=
-SITEID=
-TESTPROD=
-
-project=gbn
-
-### Bridgehead Operator
-# users may see this contact data for support purposes
-OPERATOR_FIRST_NAME=
-OPERATOR_LAST_NAME=
-OPERATOR_EMAIL=
-OPERATOR_PHONE=
-
-### Proxy configuration
-## ex.: http://my-proxy-host:my-proxy-port
-HTTP_PROXY_HOST=
-HTTP_PROXY_USER=
-HTTP_PROXY_PASSWORD=
-HTTPS_PROXY_HOST=
-HTTPS_PROXY_USER=
-HTTPS_PROXY_PASSWORD=
-
-HTTP_PROXY=
-HTTPS_PROXY=
-http_proxy=
-https_proxy=
-
-NO_PROXY=
-no_proxy=
-
-### SMTP Server
-## ex.: mailhost.intern.klinik.de
-# MAIL_HOST=
-# MAIL_PORT=25
-## ex.: no-reply@bridgehead.intern.klinik.de
-# MAIL_FROM_ADDRESS=
-# MAIL_FROM_NAME=Bridgehead Searchbroker
-
-## Connector 
-CONNECTOR_POSTGRES_HOST=
-CONNECTOR_POSTGRES_PORT=
-CONNECTOR_POSTGRES_DB=
-CONNECTOR_POSTGRES_USER=
-CONNECTOR_SHARE_URL=
-CONNECTOR_ENABLE_METRICS=
-CONNECTOR_MONITOR_INTERVAL=
-CONNECTOR_UPDATE_SERVER=
-CONNECTOR_QUERY_LANGUAGE=
-
-CATALINA_OPTS=
-MDR_URL=
-CENTRAL_SEARCH=
-DECENTRAL_SEARCH=
-MONITOR_URL=
-MONITOR_OPTOUT=
-
-LOG_LEVEL=
-
-feature_BBMRI_DIRECTORY_SYNC=false
-feature_DKTK_CENTRAL_SEARCH=false
-feature_NNGM_CTS=false
-
-LDM_URL=
-ID_MANAGER_URL=

gbn/internal.env

@@ -4,8 +4,6 @@ QUERY_LANGUAGE=CQL
 CONNECTOR_SHARE_URL="http://${HOST}:8080" 
 MDR_URL="https://mdr.germanbiobanknode.de/v3/api/mdr"
 MONITOR_URL=https://ccpit.dktk.dkfz.de/dktk.monitor/rest/info
-no_proxy=bridgehead_gbn_connector,bridgehead_gbn_blaze_store,bridgehead_gbn_connector_db
-TOMCAT_REVERSEPROXY_FQDN=${HOST}/gbn-connector
 DEPLOYMENT_CONTEXT=gbn-connector
 CONNECTOR_MONITOR_INTERVAL=
 CONNECTOR_UPDATE_SERVER=
@@ -13,16 +11,6 @@ feature_BBMRI_DIRECTORY_SYNC=false
 feature_DKTK_CENTRAL_SEARCH=false
 feature_NNGM_CTS=false
 LOG_LEVEL=info
-
-HTTP_PROXY_HOST=${PROXY_URL}
-HTTP_PROXY_USER=
-HTTP_PROXY_PASSWORD=
-HTTPS_PROXY_HOST=${PROXY_URL}
-HTTPS_PROXY_USER=
-HTTPS_PROXY_PASSWORD=
-HTTP_PROXY=${PROXY_URL}
-HTTPS_PROXY=${PROXY_URL}
-http_proxy=${PROXY_URL}
-https_proxy=${PROXY_URL}
+STORE_URL=http://bridgehead_gbn_blaze_store:8080
 
 CONNECTOR_ENABLE_METRICS=false