refactor: Resorted environment and prepared special images for dktk

gbn/docker-compose.yml

@@ -8,7 +8,7 @@ volumes:
 
 services:
   traefik:
-    container_name: bridgehead_traefik
+    container_name: traefik
     image: traefik:2.4
     command:
       - --api.insecure=true
@@ -28,7 +28,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
 
   landing:
-    container_name: bridgehead_landingpage
+    container_name: landingpage
     image: nginx:stable
     volumes:
       - ../landing/:/usr/share/nginx/html
@@ -56,8 +56,8 @@ services:
     restart: "always"
 
   connector:
-    container_name: "bridgehead_gbn_connector"
-    image: "samply/share-client:gbn-7"
+    container_name: connector
+    image: "samply/share-client:gbn-feature-environmentPreconfigurationTorben"
     environment:
       POSTGRES_HOST: "bridgehead_gbn_connector_db"
       POSTGRES_PASS: ${CONNECTOR_POSTGRES_PASS}
@@ -85,4 +85,4 @@ services:
     restart: "always"
     env_file:
     ###TODO: Move into Image
-      - internal.env
+      - internal.env

gbn/internal.env

@@ -1,28 +0,0 @@
-POSTGRES_DB=samply.connector
-POSTGRES_USER=samply
-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=
-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}
-
-CONNECTOR_ENABLE_METRICS=false