Some more adjustments for dktk

dktk/docker-compose.yml

@@ -52,11 +52,10 @@ services:
 
   connector:
     container_name: bridgehead_dktk_connector
-    image: "samply/share-client:dktk-7"
+    image: "samply/share-client:dktk-pr-148"
     environment:
       STORE_URL: ${STORE_URL}
-      POSTGRES_HOST: ${CONNECTOR_DB_HOST}
-      POSTGRES_PASS: ${CONNECTOR_POSTGRES_PASS}
+      POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS}
     volumes:
       - "connector_logs:/usr/local/tomcat/logs"
     depends_on:
@@ -66,9 +65,8 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.dktk_connector.rule=PathPrefix(`/dktk-connector`)"
       - "traefik.http.services.dktk_connector.loadbalancer.server.port=8080"
-    env_file:
-    ###TODO: Move into Image
-      - internal.env
+    ports:
+      - 65395:65395
 
   connector_db:
     container_name: bridgehead_dktk_connector_db
@@ -88,14 +86,14 @@ services:
     image: docker.verbis.dkfz.de/pseudonymisierung/magicpl:release-0.2.0
     environment:
       TOMCAT_REVERSEPROXY_FQDN: ${HOST}/id-manager
-      MAGICPL_MAINZELLISTE_API_KEY: ${MAGICPL_MAINZELLISTE_API_KEY}
-      MAGICPL_API_KEY: ${MAGICPL_API_KEY}
-      MAGICPL_API_KEY_CONNECTOR: ${MAGICPL_API_KEY_CONNECTOR}
-      MAGICPL_PASSPHRASE: ${MAGICPL_PASSPHRASE}
-      MAGICPL_MAINZELLISTE_CENTRAL_API_KEY: ${MAGICPL_MAINZELLISTE_CENTRAL_API_KEY}
-      MAGICPL_CENTRAL_API_KEY: ${MAGICPL_CENTRAL_API_KEY}
-      MAGICPL_OIDC_CLIENT_ID: ${MAGICPL_OIDC_CLIENT_ID}
-      MAGICPL_OIDC_CLIENT_SECRET: ${MAGICPL_OIDC_CLIENT_SECRET}
+      MAGICPL_MAINZELLISTE_API_KEY: "123"
+      MAGICPL_API_KEY: "123"
+      MAGICPL_API_KEY_CONNECTOR: "123"
+      MAGICPL_PASSPHRASE: "123"
+      MAGICPL_MAINZELLISTE_CENTRAL_API_KEY: "123"
+      MAGICPL_CENTRAL_API_KEY: "123"
+      MAGICPL_OIDC_CLIENT_ID: "123"
+      MAGICPL_OIDC_CLIENT_SECRET: "123"
       TZ: Europe/Berlin
     volumes:
       - "idmanager_logs:/usr/local/tomcat/logs"
@@ -143,9 +141,9 @@ services:
     container_name: bridgehead_dktk_patientlist_db
     image: postgres:13.1-alpine
     environment:
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: mainzelliste
+      POSTGRES_USER: mainzelliste      
       POSTGRES_PASSWORD: ${ML_DB_PASS}
     volumes:
       - "patientlist_db_data:/var/lib/postgresql/data"
-    env_file:
-    ###TODO: Move into Image
-      - internal.env

dktk/internal.env

@@ -6,12 +6,11 @@ CONNECTOR_ENABLE_METRICS=false
 CONNECTOR_MONITOR_INTERVAL=
 CONNECTOR_UPDATE_SERVER=
 
-TOMCAT_REVERSEPROXY_FQDN=${HOST}/dktk-connector
 DEPLOYMENT_CONTEXT=dktk-connector
 
 POSTGRES_PORT=5432
-POSTGRES_DB=samply.connector
-POSTGRES_USER=samply.connector
+POSTGRES_DB=share_v2
+POSTGRES_USER=samplyweb
 
 HTTP_PROXY_HOST=${PROXY_URL}
 HTTP_PROXY_USER=
@@ -28,9 +27,14 @@ CCP_CENTRALSEARCH_URL=https://centralsearch-test.dktk.dkfz.de/
 CCP_DECENTRALSEARCH_URL=https://decentralsearch-test.ccp-it.dktk.dkfz.de/
 
 CCP_MDR_URL=https://mdr.ccp-it.dktk.dkfz.de/v3/api/mdr
+MDR_URL=https://mdr.ccp-it.dktk.dkfz.de/v3/api/mdr
+
 CCP_MONITOR_URL=
 MONITOR_OPTOUT=
 
+PATIENTLIST_URL=http://bridgehead_patientlist:8080/Patientlist
+PROJECTPSEUDONYMISATION_URL=http://bridgehead_patientlist:8080/Patientlist
+
 ## nNGM
 #NNGM_URL=http://bridgeheadstore:8080
 #NNGM_PROFILE=http://uk-koeln.de/fhir/StructureDefinition/Patient/nNGM/pseudonymisiert
@@ -42,9 +46,9 @@ MDR_NAMESPACE=adt,dktk,marker
 MDR_VALIDATION=false
 
 ML_DB_HOST=bridgehead_dktk_patientlist_db
-ML_DB_NAME=samply.connector
+ML_DB_NAME=mainzelliste
 ML_DB_PORT=5432
-ML_DB_USER=samply.connector
+ML_DB_USER=mainzelliste
 
 CENTRAL_CONTROL_NUMBER_GENERATPR_URL=http://e260-serv-03/central/api
 GLOBAL_ID=DKTK
@@ -52,6 +56,8 @@ MAINZELLISTE_URL=https://patientlist-test.ccpit.dktk.dkfz.de/mainzelliste
 ML_DB_DRIVER=org.postgresql.Driver
 ML_DB_TYPE=postgresql
 
+MAGICPL_MAINZELLISTE_URL=http://bridgehead_patientlist:8080
+
 ML_LOG_LEVEL=warning
 ML_SITE=BRIDGEHEAD_DKTK_TEST
 TZ=Europe/Berlin