Added setting bridgehead path to enviroment

c4/docker-compose.yml

@@ -28,7 +28,7 @@ services:
       SITEID: ${SITEID}
       CENTRAL_SEARCH: ${CCP_CENTRALSEARCH_URL}
       DECENTRAL_SEARCH: ${CCP_DECENTRALSEARCH_URL}
-      MDR_URL: ${MDR_URL}
+      MDR_URL: ${CCP_MDR_URL}
       MONITOR_URL: ${CCP_MONITOR_URL}
       SHARE_URL: "${PROTOCOL}://${HOST}:${PORT}"
       ID_MANAGER_URL: ${ID_MANAGER_URL}
@@ -39,8 +39,7 @@ services:
       POSTGRES_PORT: ${CONNECTOR_DB_PORT}
       POSTGRES_DB: ${CONNECTOR_POSTGRES_DB}
       POSTGRES_USER: ${CONNECTOR_POSTGRES_USER}
-      POSTGRES_PASS: ${C4_CONNECTOR_POSTGRES_PASSWORD}
-      DEPLOYMENT_CONTEXT: ${COMPOSE_PROJECT_NAME}-connector
+      POSTGRES_PASS: ${CONNECTOR_POSTGRES_PASS}
       HTTP_PROXY_URL: ${HTTP_PROXY_URL}
       HTTP_PROXY_USERNAME: ${HTTP_PROXY_USERNAME}
       HTTP_PROXY_PASSWORD: ${HTTP_PROXY_PASSWORD}
@@ -53,54 +52,104 @@ services:
     depends_on:
       - connector_db
     ports:
-      - "8082:8080"
-      - "65496:65395"
+      - "8080:8080"
     restart: always
  
   connector_db:
     container_name: bridgehead_connector_db
     image: postgres:10.17
     environment:
+      POSTGRES_HOST: ${CONNECTOR_POSTGRES_HOST}
       POSTGRES_DB: ${CONNECTOR_POSTGRES_DB}
       POSTGRES_USER: ${CONNECTOR_POSTGRES_USER}
-      POSTGRES_PASSWORD: ${C4_CONNECTOR_POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: ${CONNECTOR_POSTGRES_PASS}
       TZ: Europe/Berlin
     volumes:
       - "connector_db_data:/var/lib/postgresql/data"
     restart: always
 
-  ## ID-Management
+
   idmanager:
     container_name: bridgehead_idmanager
-    image: docker.verbis.dkfz.de/ccp/idmanager:deploy-c4
+    image: docker.verbis.dkfz.de/pseudonymisierung/magicpl:0.2.0-RC23
     environment:
-      MAGICPL_MAINZELLISTE_CENTRAL_URL: ${CCP_PATIENTLIST_URL}
-      MAGICPL_CENTRAL_URL: ${CCP_CONTROLLNUMBERGENERATOR_URL}
-      MAGICPL_SITE: ${SITEID}
+      MAGICPL_MAINZELLISTE_URL: ${MAGICPL_MAINZELLISTE_URL}
+      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_URL: ${MAGICPL_MAINZELLISTE_CENTRAL_URL}
+      MAGICPL_MAINZELLISTE_CENTRAL_API_KEY: ${MAGICPL_MAINZELLISTE_CENTRAL_API_KEY}
+      MAGICPL_CENTRAL_URL: ${MAGICPL_CENTRAL_URL}
+      MAGICPL_CENTRAL_API_KEY: ${MAGICPL_CENTRAL_API_KEY}
+      MAGICPL_OIDC_PROVIDER: ${MAGICPL_OIDC_PROVIDER}
+      MAGICPL_OIDC_CLIENT_ID: ${MAGICPL_OIDC_CLIENT_ID}
+      MAGICPL_OIDC_CLIENT_SECRET: ${MAGICPL_OIDC_CLIENT_SECRET}
+      MAGICPL_SITE: adt
       MAGICPL_LOG_LEVEL: info
-      GLOBAL_ID: DKTK
       TZ: Europe/Berlin
     volumes:
       - "idmanager_logs:/usr/local/tomcat/logs"
-    ports:
-      - "8084:8080"
     secrets:
       - magicpl.docker.xml
       - dktk_bridgehead_info.docker.xml
       - proxy.docker.xml
+    depends_on:
+      - patientlist
+    ports:
+      - "8085:8080"
+  
+  patientlist:
+    container_name: bridgehead_patientlist
+    image: medicalinformatics/mainzelliste:develop
+    environment:
+      ML_DB_DRIVER: org.postgresql.Driver
+      ML_DB_TYPE: postgresql
+      ML_DB_HOST: ${ML_DB_HOST}
+      ML_DB_PORT: ${ML_DB_PORT}
+      ML_DB_NAME: ${ML_DB_NAME}
+      ML_DB_USER: ${ML_DB_USER}
+      ML_DB_PASS: ${ML_DB_PASS}
+      ML_API_KEY: ${ML_API_KEY}
+      ML_LOG_LEVEL: warning
+      ML_SITE: adt
+      TZ: Europe/Berlin
+    env_file:
+      - ./site-config/patientlist.env
+    volumes:
+      - "patientlist_logs:/usr/local/tomcat/logs"
+    secrets:
+      - mainzelliste.docker.conf
+      - centralSearchPublicKey
+    depends_on:
+      - patientlist_db
+    ports:
+      - "8086:8080"
+
+  patientlist_db:
+    container_name: bridgehead_patientlist_db
+    image: postgres:13.1-alpine
+    environment:
+      POSTGRES_HOST: ${ML_DB_HOST}
+      POSTGRES_DB: ${ML_DB_NAME}
+      POSTGRES_USER: ${ML_DB_USER}
+      POSTGRES_PASSWORD: ${ML_DB_PASS}
+      TZ: Europe/Berlin
+    volumes:
+      - "patientlist_db_data:/var/lib/postgresql/data"
 
   store:
     container_name: bridgehead_store
     image: docker.verbis.dkfz.de/ccp/samply.store:release-5.1.2
     environment:
       MDR_URL: ${CCP_MDR_URL}
-      MDR_NAMESPACE: adt,dktk,marker
-      MDR_VALIDATION: "false"
-      POSTGRES_HOST: bridgehead_store_db
-      POSTGRES_PORT: 5432
-      POSTGRES_DB: samplystore
-      POSTGRES_USER: samplystore
-      POSTGRES_PASSWORD: ${C4_SAMPLY_STORE_PASS}
+      MDR_NAMESPACE: ${MDR_NAMESPACE}
+      MDR_VALIDATION: ${MDR_VALIDATION}
+      POSTGRES_HOST: ${STORE_POSTGRES_HOST}
+      POSTGRES_PORT: ${STORE_POSTGRES_PORT}
+      POSTGRES_DB: ${STORE_POSTGRES_DB}
+      POSTGRES_USER: ${STORE_POSTGRES_USER}
+      POSTGRES_PASSWORD: ${STORE_POSTGRES_PASS}
       TZ: Europe/Berlin
     volumes:
       - "store_logs:/usr/local/tomcat/logs"
@@ -108,7 +157,6 @@ services:
       - store_db
     ports:
       - "8083:8080"
-      - "65495:65395"
     restart: always
 
   store_db:
@@ -116,11 +164,11 @@ services:
     image: postgres:10.17
     command: postgres -c datestyle='iso, dmy'
     environment:
-      POSTGRES_HOST: store_db
-      POSTGRES_PORT: 5432
-      POSTGRES_DB: samplystore
-      POSTGRES_USER: samplystore
-      POSTGRES_PASSWORD: ${C4_SAMPLY_STORE_PASS}
+      POSTGRES_HOST: ${STORE_POSTGRES_HOST}
+      POSTGRES_PORT: ${STORE_POSTGRES_PORT}
+      POSTGRES_DB: ${STORE_POSTGRES_DB}
+      POSTGRES_USER: ${STORE_POSTGRES_USER}
+      POSTGRES_PASSWORD: ${STORE_POSTGRES_PASS}
       TZ: Europe/Berlin
     volumes:
       - "store_db_data:/var/lib/postgresql/data"