diff --git a/ccp/modules/teiler-compose.yml b/ccp/modules/teiler-compose.yml index f415ee9..46943d4 100644 --- a/ccp/modules/teiler-compose.yml +++ b/ccp/modules/teiler-compose.yml @@ -31,6 +31,7 @@ services: environment: DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" TEILER_BACKEND_URL: "https://${HOST}/ccp-teiler-backend" + TEILER_DASHBOARD_URL: "https://${HOST}/ccp-teiler-dashboard" OIDC_URL: "${OIDC_URL}" OIDC_REALM: "${OIDC_REALM}" OIDC_CLIENT_ID: "${OIDC_PUBLIC_CLIENT_ID}" @@ -41,7 +42,6 @@ services: TEILER_PROJECT: "${PROJECT}" EXPORTER_API_KEY: "${EXPORTER_API_KEY}" TEILER_ORCHESTRATOR_URL: "https://${HOST}/ccp-teiler" - TEILER_DASHBOARD_HTTP_RELATIVE_PATH: "/ccp-teiler-dashboard" TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/ccp-teiler" TEILER_USER: "${OIDC_USER_GROUP}" TEILER_ADMIN: "${OIDC_ADMIN_GROUP}" diff --git a/modules/transfair-compose.yml b/modules/transfair-compose.yml index e7e0eea..d2027fb 100644 --- a/modules/transfair-compose.yml +++ b/modules/transfair-compose.yml @@ -8,7 +8,8 @@ services: - TTP_URL - TTP_ML_API_KEY - TTP_GW_SOURCE - - TTP_GW_DOMAIN + - TTP_GW_EPIX_DOMAIN + - TTP_GW_GPAS_DOMAIN - TTP_TYPE - TTP_AUTH - PROJECT_ID_SYSTEM @@ -23,6 +24,8 @@ services: - RUST_LOG=${RUST_LOG:-info} - TLS_CA_CERTIFICATES_DIR=/conf/trusted-ca-certs - TLS_DISABLE=${TRANSFAIR_TLS_DISABLE:-false} + - NO_PROXY=${TRANSFAIR_NO_PROXIES} + - ALL_PROXY=http://forward_proxy:3128 volumes: - /var/cache/bridgehead/${PROJECT}/transfair:/transfair - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro @@ -60,9 +63,9 @@ services: transfair-request-blaze: image: docker.verbis.dkfz.de/cache/samply/blaze:${BLAZE_TAG} - container_name: bridgehead-transfair-requests-blaze + container_name: bridgehead-transfair-request-blaze environment: - BASE_URL: "http://bridgehead-transfair-requests-blaze:8080" + BASE_URL: "http://bridgehead-transfair-request-blaze:8080" JAVA_TOOL_OPTIONS: "-Xmx1024m" DB_BLOCK_CACHE_SIZE: 1024 CQL_EXPR_CACHE_SIZE: 8 diff --git a/modules/transfair-setup.sh b/modules/transfair-setup.sh index 1d202a3..8a36ee1 100755 --- a/modules/transfair-setup.sh +++ b/modules/transfair-setup.sh @@ -15,7 +15,7 @@ function transfairSetup() { log INFO "TransFAIR request fhir store set to external $FHIR_REQUEST_URL" else log INFO "TransFAIR request fhir store not set writing to internal blaze" - FHIR_REQUEST_URL="http://transfair-requests-blaze:8080" + FHIR_REQUEST_URL="http://transfair-request-blaze:8080" OVERRIDE+=" --profile transfair-request-blaze" fi if [ -n "$TTP_GW_SOURCE" ]; then @@ -27,5 +27,9 @@ function transfairSetup() { else log INFO "TransFAIR configured without ttp" fi + TRANSFAIR_NO_PROXIES="transfair-input-blaze,blaze,transfair-requests-blaze" + if [ -n "${TRANSFAIR_NO_PROXY}" ]; then + TRANSFAIR_NO_PROXIES+=",${TRANSFAIR_NO_PROXY}" + fi fi }