From d068b1c6df4507f93cc6398e7a9913d2242fcf76 Mon Sep 17 00:00:00 2001 From: David Juarez Date: Thu, 22 May 2025 14:30:30 +0200 Subject: [PATCH] Teiler in BBMRI --- bbmri/vars | 3 +++ ccp/modules/exporter-compose.yml | 10 ++++++++++ ccp/modules/teiler-compose.yml | 19 ++++++++----------- ccp/modules/teiler-setup.sh | 2 -- ccp/vars | 3 +++ kr/modules/teiler-compose.yml | 6 +++--- kr/modules/teiler-setup.sh | 2 -- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/bbmri/vars b/bbmri/vars index 5f5c73b..70693c7 100644 --- a/bbmri/vars +++ b/bbmri/vars @@ -1,3 +1,6 @@ +DEFAULT_LANGUAGE=EN +DEFAULT_LANGUAGE_LOWER_CASE=${DEFAULT_LANGUAGE,,} + BROKER_ID=broker-test.bbmri-test.samply.de BROKER_URL=https://${BROKER_ID} PROXY_ID=${SITE_ID}.${BROKER_ID} diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml index ac0809e..1c764b3 100644 --- a/ccp/modules/exporter-compose.yml +++ b/ccp/modules/exporter-compose.yml @@ -18,6 +18,11 @@ services: OPAL_PASSWORD: "${EXPORTER_OPAL_PASSWORD}" labels: - "traefik.enable=true" + - "traefik.http.routers.exporter_${PLATFORM}.rule=PathPrefix(`/${PLATFORM}-exporter`)" + - "traefik.http.services.exporter_${PLATFORM}.loadbalancer.server.port=8092" + - "traefik.http.routers.exporter_${PLATFORM}.tls=true" + - "traefik.http.middlewares.exporter_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-exporter" + - "traefik.http.routers.exporter_${PLATFORM}.middlewares=exporter_${PLATFORM}_strip" - "traefik.http.routers.exporter_${PLATFORM}.rule=Path(`/${PLATFORM}-exporter/`)" - "traefik.http.services.exporter_${PLATFORM}.loadbalancer.server.port=8092" - "traefik.http.routers.exporter_${PLATFORM}.tls=true" @@ -83,3 +88,8 @@ services: - "traefik.http.routers.reporter_${PLATFORM}_api.tls=true" - "traefik.http.routers.reporter_${PLATFORM}_api.middlewares=reporter_${PLATFORM}_strip,exporter_auth" - "traefik.http.routers.reporter_${PLATFORM}_api.priority=25" + + focus: + environment: + EXPORTER_URL: "http://exporter:8092" + EXPORTER_API_KEY: "${EXPORTER_API_KEY}" diff --git a/ccp/modules/teiler-compose.yml b/ccp/modules/teiler-compose.yml index 57d85d8..29a926a 100644 --- a/ccp/modules/teiler-compose.yml +++ b/ccp/modules/teiler-compose.yml @@ -15,12 +15,11 @@ services: environment: TEILER_BACKEND_URL: "https://${HOST}/${PLATFORM}-teiler-backend" TEILER_DASHBOARD_URL: "https://${HOST}/${PLATFORM}-teiler-dashboard" - DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE_LOWER_CASE}" + DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE_LOWER_CASE}" HTTP_RELATIVE_PATH: "/${PLATFORM}-teiler" teiler-dashboard: - #image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:develop - image: docker.verbis.dkfz.de/ccp/samply/teiler-dashboard:bbmri + image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:develop container_name: bridgehead-teiler-dashboard labels: - "traefik.enable=true" @@ -30,9 +29,9 @@ services: - "traefik.http.middlewares.teiler_dashboard_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-teiler-dashboard" - "traefik.http.routers.teiler_dashboard_${PLATFORM}.middlewares=teiler_dashboard_${PLATFORM}_strip" environment: - DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" + DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}" TEILER_BACKEND_URL: "https://${HOST}/${PLATFORM}-teiler-backend" - TEILER_DASHBOARD_URL: "https://${HOST}/${PLATFORM}-ccp-teiler-dashboard" + TEILER_DASHBOARD_URL: "https://${HOST}/${PLATFORM}-teiler-dashboard" OIDC_URL: "${OIDC_URL}" OIDC_REALM: "${OIDC_REALM}" OIDC_CLIENT_ID: "${OIDC_PUBLIC_CLIENT_ID}" @@ -51,8 +50,7 @@ services: teiler-backend: - #image: docker.verbis.dkfz.de/ccp/${PROJECT}-teiler-backend:latest - image: ttl.sh/bbmri-teiler-backend:5h + image: docker.verbis.dkfz.de/ccp/${PROJECT}-teiler-backend:latest container_name: bridgehead-teiler-backend labels: - "traefik.enable=true" @@ -65,19 +63,18 @@ services: LOG_LEVEL: "INFO" APPLICATION_PORT: "8085" APPLICATION_ADDRESS: "${HOST}" - DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" - CONFIG_ENV_VAR_PATH: "/run/secrets/project-conf" + DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}" + CONFIG_ENV_VAR_PATH: "/run/secrets/${PLATFORM}.conf" TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/${PLATFORM}-teiler" TEILER_ORCHESTRATOR_URL: "https://${HOST}/${PLATFORM}-teiler" TEILER_DASHBOARD_DE_URL: "https://${HOST}/${PLATFORM}-teiler-dashboard/de" TEILER_DASHBOARD_EN_URL: "https://${HOST}/${PLATFORM}-teiler-dashboard/en" - CENTRAX_URL: "${CENTRAXX_URL}" HTTP_PROXY: "http://forward_proxy:3128" ENABLE_MTBA: "${ENABLE_MTBA}" ENABLE_DATASHIELD: "${ENABLE_DATASHIELD}" IDMANAGER_UPLOAD_APIKEY: "${IDMANAGER_UPLOAD_APIKEY}" # Only used to check if the ID Manager is active secrets: - - project-conf + - ${PLATFORM}.conf secrets: project-conf: diff --git a/ccp/modules/teiler-setup.sh b/ccp/modules/teiler-setup.sh index dbf4efe..1d6820d 100644 --- a/ccp/modules/teiler-setup.sh +++ b/ccp/modules/teiler-setup.sh @@ -3,7 +3,5 @@ if [ "$ENABLE_TEILER" == true ];then log INFO "Teiler setup detected -- will start Teiler services." OVERRIDE+=" -f ./ccp/modules/teiler-compose.yml" - TEILER_DEFAULT_LANGUAGE=DE - TEILER_DEFAULT_LANGUAGE_LOWER_CASE=${TEILER_DEFAULT_LANGUAGE,,} add_public_oidc_redirect_url "/ccp-teiler/*" fi diff --git a/ccp/vars b/ccp/vars index 34b504b..265ae41 100644 --- a/ccp/vars +++ b/ccp/vars @@ -1,3 +1,6 @@ +DEFAULT_LANGUAGE=EN +DEFAULT_LANGUAGE_LOWER_CASE=${DEFAULT_LANGUAGE,,} + BROKER_ID=broker.ccp-it.dktk.dkfz.de BROKER_URL=https://${BROKER_ID} PROXY_ID=${SITE_ID}.${BROKER_ID} diff --git a/kr/modules/teiler-compose.yml b/kr/modules/teiler-compose.yml index c862594..dd5b734 100644 --- a/kr/modules/teiler-compose.yml +++ b/kr/modules/teiler-compose.yml @@ -15,7 +15,7 @@ services: environment: TEILER_BACKEND_URL: "https://${HOST}/ccp-teiler-backend" TEILER_DASHBOARD_URL: "https://${HOST}/ccp-teiler-dashboard" - DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE_LOWER_CASE}" + DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE_LOWER_CASE}" HTTP_RELATIVE_PATH: "/ccp-teiler" teiler-dashboard: @@ -29,7 +29,7 @@ services: - "traefik.http.middlewares.teiler_dashboard_ccp_strip.stripprefix.prefixes=/ccp-teiler-dashboard" - "traefik.http.routers.teiler_dashboard_ccp.middlewares=teiler_dashboard_ccp_strip" environment: - DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" + DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}" TEILER_BACKEND_URL: "https://${HOST}/ccp-teiler-backend" TEILER_DASHBOARD_URL: "https://${HOST}/ccp-teiler-dashboard" OIDC_URL: "${OIDC_URL}" @@ -63,7 +63,7 @@ services: LOG_LEVEL: "INFO" APPLICATION_PORT: "8085" APPLICATION_ADDRESS: "${HOST}" - DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}" + DEFAULT_LANGUAGE: "${DEFAULT_LANGUAGE}" CONFIG_ENV_VAR_PATH: "/run/secrets/ccp.conf" TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/ccp-teiler" TEILER_ORCHESTRATOR_URL: "https://${HOST}/ccp-teiler" diff --git a/kr/modules/teiler-setup.sh b/kr/modules/teiler-setup.sh index eed3f81..1e97079 100644 --- a/kr/modules/teiler-setup.sh +++ b/kr/modules/teiler-setup.sh @@ -3,7 +3,5 @@ if [ "$ENABLE_TEILER" == true ];then log INFO "Teiler setup detected -- will start Teiler services." OVERRIDE+=" -f ./$PROJECT/modules/teiler-compose.yml" - TEILER_DEFAULT_LANGUAGE=DE - TEILER_DEFAULT_LANGUAGE_LOWER_CASE=${TEILER_DEFAULT_LANGUAGE,,} add_public_oidc_redirect_url "/ccp-teiler/*" fi