samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Routing and ReverseProxy Settings for ID-Manager and Patientlist

This commit is contained in:
Torben Brenner 2022-02-04 16:42:58 +01:00
parent 24856376b9
commit 87f345ca31
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dktk/docker-compose.yml
View File

@ -54,6 +54,8 @@ services:
container_name: bridgehead_dktk_connector container_name: bridgehead_dktk_connector
image: "samply/share-client:dktk-7" image: "samply/share-client:dktk-7"
environment: environment:
TOMCAT_REVERSEPROXY_FQDN: ${HOST}/dktk-connector
DEPLOYMENT_CONTEXT: dktk-connector
STORE_URL: ${STORE_URL} STORE_URL: ${STORE_URL}
POSTGRES_HOST: ${CONNECTOR_DB_HOST} POSTGRES_HOST: ${CONNECTOR_DB_HOST}
POSTGRES_PASS: ${CONNECTOR_POSTGRES_PASS} POSTGRES_PASS: ${CONNECTOR_POSTGRES_PASS}
@ -87,7 +89,9 @@ services:
container_name: bridgehead_id-manager container_name: bridgehead_id-manager
image: docker.verbis.dkfz.de/pseudonymisierung/magicpl:release-0.2.0 image: docker.verbis.dkfz.de/pseudonymisierung/magicpl:release-0.2.0
environment: environment:
TOMCAT_REVERSEPROXY_FQDN: ${HOST}/id-manager TOMCAT_REVERSEPROXY_FQDN: ${HOST}
DEPLOYMENT_CONTEXT: id-manager
MAGICPL_SITE: ${SITEID}
MAGICPL_MAINZELLISTE_API_KEY: ${MAGICPL_MAINZELLISTE_API_KEY} MAGICPL_MAINZELLISTE_API_KEY: ${MAGICPL_MAINZELLISTE_API_KEY}
MAGICPL_API_KEY: ${MAGICPL_API_KEY} MAGICPL_API_KEY: ${MAGICPL_API_KEY}
MAGICPL_API_KEY_CONNECTOR: ${MAGICPL_API_KEY_CONNECTOR} MAGICPL_API_KEY_CONNECTOR: ${MAGICPL_API_KEY_CONNECTOR}
@ -107,9 +111,6 @@ services:
- patientlist - patientlist
labels: labels:
- "traefik.http.routers.idmanager.rule=PathPrefix(`/id-manager`)" - "traefik.http.routers.idmanager.rule=PathPrefix(`/id-manager`)"
- "traefik.http.middlewares.idmanager_strip.stripprefix.prefixes=/id-mana\
ger"
- "traefik.http.routers.idmanager.middlewares=idmanager_strip"
- "traefik.http.services.idmanager.loadbalancer.server.port=8080" - "traefik.http.services.idmanager.loadbalancer.server.port=8080"
env_file: env_file:
###TODO: Move into Image ###TODO: Move into Image
@ -121,7 +122,9 @@ services:
environment: environment:
ML_DB_PASS: ${ML_DB_PASS} ML_DB_PASS: ${ML_DB_PASS}
ML_API_KEY: ${ML_API_KEY} ML_API_KEY: ${ML_API_KEY}
TOMCAT_REVERSEPROXY_FQDN: ${HOST}/patientlist ML_SITE: ${SITEID}
TOMCAT_REVERSEPROXY_FQDN: ${HOST}
DEPLOYMENT_CONTEXT: patientlist
env_file: env_file:
- ../site-config/patientlist.env - ../site-config/patientlist.env
- internal.env - internal.env
@ -132,9 +135,6 @@ services:
- centralSearchPublicKey - centralSearchPublicKey
labels: labels:
- "traefik.http.routers.patientlist.rule=PathPrefix(`/patientlist`)" - "traefik.http.routers.patientlist.rule=PathPrefix(`/patientlist`)"
- "traefik.http.middlewares.patientlist_strip.stripprefix.prefixes=/patie\
ntlist"
- "traefik.http.routers.patientlist.middlewares=patientlist_strip"
- "traefik.http.services.patientlist.loadbalancer.server.port=8080" - "traefik.http.services.patientlist.loadbalancer.server.port=8080"
depends_on: depends_on:
- patientlist_db - patientlist_db

6
dktk/internal.env
View File

@ -1,14 +1,8 @@
SITE=bridgehead_dktk_test
SITEID=BRIDGEHEAD_DKTK_TEST
CONNECTOR_SHARE_URL="http://${HOST}:8080" CONNECTOR_SHARE_URL="http://${HOST}:8080"
CONNECTOR_ENABLE_METRICS=false CONNECTOR_ENABLE_METRICS=false
CONNECTOR_MONITOR_INTERVAL= CONNECTOR_MONITOR_INTERVAL=
CONNECTOR_UPDATE_SERVER= CONNECTOR_UPDATE_SERVER=
TOMCAT_REVERSEPROXY_FQDN=${HOST}/dktk-connector
DEPLOYMENT_CONTEXT=dktk-connector
POSTGRES_PORT=5432 POSTGRES_PORT=5432
POSTGRES_DB=samply.connector POSTGRES_DB=samply.connector
POSTGRES_USER=samply.connector POSTGRES_USER=samply.connector