diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml index 2e4e139f..b7a71b28 100644 --- a/ccp/docker-compose.yml +++ b/ccp/docker-compose.yml @@ -33,6 +33,7 @@ services: RETRY_COUNT: ${FOCUS_RETRY_COUNT} EPSILON: 0.28 QUERIES_TO_CACHE: '/queries_to_cache.conf' + ENDPOINT_TYPE: ${FOCUS_ENDPOINT_TYPE:-blaze} volumes: - /srv/docker/bridgehead/ccp/queries_to_cache.conf:/queries_to_cache.conf depends_on: @@ -58,7 +59,6 @@ services: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro - volumes: blaze-data: diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml index d5eb2274..10ae89ff 100644 --- a/ccp/modules/exporter-compose.yml +++ b/ccp/modules/exporter-compose.yml @@ -65,3 +65,8 @@ services: - "traefik.http.routers.reporter_ccp.tls=true" - "traefik.http.middlewares.reporter_ccp_strip.stripprefix.prefixes=/ccp-reporter" - "traefik.http.routers.reporter_ccp.middlewares=reporter_ccp_strip" + + focus: + environment: + EXPORTER_URL: "http://exporter:8092" + EXPORTER_API_KEY: "${EXPORTER_API_KEY}" diff --git a/ccp/modules/fhir2sql-compose.yml b/ccp/modules/fhir2sql-compose.yml index 7733787d..1230e898 100644 --- a/ccp/modules/fhir2sql-compose.yml +++ b/ccp/modules/fhir2sql-compose.yml @@ -23,3 +23,7 @@ services: POSTGRES_DB: "dashboard" volumes: - "/var/cache/bridgehead/ccp/dashboard-db:/var/lib/postgresql/data" + + focus: + environment: + POSTGRES_CONNECTION_STRING: "postgresql://dashboard:${DASHBOARD_DB_PASSWORD}@dashboard-db/dashboard" \ No newline at end of file diff --git a/ccp/modules/fhir2sql-setup.sh b/ccp/modules/fhir2sql-setup.sh index 64fa7c08..8c9a72b8 100644 --- a/ccp/modules/fhir2sql-setup.sh +++ b/ccp/modules/fhir2sql-setup.sh @@ -4,4 +4,5 @@ if [ "$ENABLE_FHIR2SQL" == true ]; then log INFO "Dashboard setup detected -- will start Dashboard backend and FHIR2SQL service." OVERRIDE+=" -f ./$PROJECT/modules/fhir2sql-compose.yml" DASHBOARD_DB_PASSWORD="$(generate_simple_password 'fhir2sql')" + FOCUS_ENDPOINT_TYPE="blaze-and-sql" fi diff --git a/ccp/modules/id-management-compose.yml b/ccp/modules/id-management-compose.yml index ce0a58a4..b7c3f61c 100644 --- a/ccp/modules/id-management-compose.yml +++ b/ccp/modules/id-management-compose.yml @@ -101,5 +101,12 @@ services: forward_proxy: condition: service_healthy + ccp-patient-project-identificator: + image: docker.verbis.dkfz.de/cache/samply/ccp-patient-project-identificator + container_name: bridgehead-ccp-patient-project-identificator + environment: + MAINZELLISTE_APIKEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY} + SITE_NAME: ${SITE_NAME} + volumes: patientlist-db-data: diff --git a/lib/update-bridgehead.sh b/lib/update-bridgehead.sh index 44655b16..56afb17b 100755 --- a/lib/update-bridgehead.sh +++ b/lib/update-bridgehead.sh @@ -58,7 +58,8 @@ for DIR in /etc/bridgehead $(pwd); do OUT=$(retry 5 git -c http.proxy=$HTTPS_PROXY_FULL_URL -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR fetch 2>&1 && retry 5 git -c http.proxy=$HTTPS_PROXY_FULL_URL -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR pull 2>&1) fi if [ $? -ne 0 ]; then - report_error log "Unable to update git $DIR: $OUT" + OUT_SAN=$(echo $OUT | sed -E 's|://[^:]+:[^@]+@|://credentials@|g') + report_error log "Unable to update git $DIR: $OUT_SAN" fi new_git_hash="$(git -C $DIR rev-parse --verify HEAD)"