unified PLATFORM and PROJECT

2025-11-04 04:50:17 +01:00 · 2024-12-12 14:43:24 +01:00
parent 3aa34e58e0
commit a66e6aebaa
4 changed files with 49 additions and 49 deletions
--- a/minimal/modules/export-and-qb.curl-templates
+++ b/minimal/modules/export-and-qb.curl-templates
@@ -1,6 +1,6 @@
 # Full Excel Export
-curl --location --request POST 'https://${HOST}/${PLATFORM}-exporter/request?query=Patient&query-format=FHIR_PATH&template-id=${PLATFORM}&output-format=EXCEL' \
+curl --location --request POST 'https://${HOST}/${PROJECT}-exporter/request?query=Patient&query-format=FHIR_PATH&template-id=${PROJECT}&output-format=EXCEL' \
 --header 'x-api-key: ${EXPORT_API_KEY}'

 # QB
-curl --location --request POST 'https://${HOST}/${PLATFORM}-reporter/generate?template-id=${PLATFORM}'
+curl --location --request POST 'https://${HOST}/${PROJECT}-reporter/generate?template-id=${PROJECT}'
--- a/minimal/modules/exporter-compose.yml
+++ b/minimal/modules/exporter-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
  exporter:
    image: docker.verbis.dkfz.de/ccp/dktk-exporter:latest
-    container_name: bridgehead-${PLATFORM}-exporter
+    container_name: bridgehead-${PROJECT}-exporter
    environment:
      JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC"
      LOG_LEVEL: "INFO"
@@ -12,41 +12,41 @@ services:
      EXPORTER_DB_USER: "exporter"
      EXPORTER_DB_PASSWORD: "${EXPORTER_DB_PASSWORD}" # Set in exporter-setup.sh
      EXPORTER_DB_URL: "jdbc:postgresql://exporter-db:5432/exporter"
-      HTTP_RELATIVE_PATH: "/${PLATFORM}-exporter"
+      HTTP_RELATIVE_PATH: "/${PROJECT}-exporter"
      SITE: "${SITE_ID}"
      HTTP_SERVLET_REQUEST_SCHEME: "https"
      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_${PROJECT}.rule=PathPrefix(`/${PROJECT}-exporter`)"
+      - "traefik.http.services.exporter_${PROJECT}.loadbalancer.server.port=8092"
+      - "traefik.http.routers.exporter_${PROJECT}.tls=true"
+      - "traefik.http.middlewares.exporter_${PROJECT}_strip.stripprefix.prefixes=/${PROJECT}-exporter"
+      - "traefik.http.routers.exporter_${PROJECT}.middlewares=exporter_${PROJECT}_strip"
      - "traefik.http.routers.connector.middlewares=connector_strip,auth-qr"
    volumes:
-      - "/var/cache/bridgehead/${PLATFORM}/exporter-files:/app/exporter-files/output"
+      - "/var/cache/bridgehead/${PROJECT}/exporter-files:/app/exporter-files/output"


  exporter-db:
    image: docker.verbis.dkfz.de/cache/postgres:${POSTGRES_TAG}
-    container_name: bridgehead-${PLATFORM}-exporter-db
+    container_name: bridgehead-${PROJECT}-exporter-db
    environment:
      POSTGRES_USER: "exporter"
      POSTGRES_PASSWORD: "${EXPORTER_DB_PASSWORD}" # Set in exporter-setup.sh
      POSTGRES_DB: "exporter"
    volumes:
      # Consider removing this volume once we find a solution to save Lens-queries to be executed in the explorer.
-      - "/var/cache/bridgehead/${PLATFORM}/exporter-db:/var/lib/postgresql/data"
+      - "/var/cache/bridgehead/${PROJECT}/exporter-db:/var/lib/postgresql/data"

  reporter:
    image: docker.verbis.dkfz.de/ccp/dktk-reporter:latest
-    container_name: bridgehead-${PLATFORM}-reporter
+    container_name: bridgehead-${PROJECT}-reporter
    environment:
      JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC"
      LOG_LEVEL: "INFO"
      CROSS_ORIGINS: "https://${HOST}"
-      HTTP_RELATIVE_PATH: "/${PLATFORM}-reporter"
+      HTTP_RELATIVE_PATH: "/${PROJECT}-reporter"
      SITE: "${SITE_ID}"
      EXPORTER_API_KEY: "${EXPORTER_API_KEY}" # Set in exporter-setup.sh
      EXPORTER_URL: "http://exporter:8092"
@@ -59,14 +59,14 @@ services:
    # There is a risk that the bridgehead restarts, losing the already created export.

    volumes:
-      - "/var/cache/bridgehead/${PLATFORM}/reporter-files:/app/reports"
+      - "/var/cache/bridgehead/${PROJECT}/reporter-files:/app/reports"
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.reporter_${PLATFORM}.rule=PathPrefix(`/${PLATFORM}-reporter`)"
-      - "traefik.http.services.reporter_${PLATFORM}.loadbalancer.server.port=8095"
-      - "traefik.http.routers.reporter_${PLATFORM}.tls=true"
-      - "traefik.http.middlewares.reporter_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-reporter"
-      - "traefik.http.routers.reporter_${PLATFORM}.middlewares=reporter_${PLATFORM}_strip"
+      - "traefik.http.routers.reporter_${PROJECT}.rule=PathPrefix(`/${PROJECT}-reporter`)"
+      - "traefik.http.services.reporter_${PROJECT}.loadbalancer.server.port=8095"
+      - "traefik.http.routers.reporter_${PROJECT}.tls=true"
+      - "traefik.http.middlewares.reporter_${PROJECT}_strip.stripprefix.prefixes=/${PROJECT}-reporter"
+      - "traefik.http.routers.reporter_${PROJECT}.middlewares=reporter_${PROJECT}_strip"

  traefik:
    labels:
--- a/minimal/modules/teiler-compose.yml
+++ b/minimal/modules/teiler-compose.yml
@@ -7,16 +7,16 @@ services:
    container_name: bridgehead-teiler-orchestrator
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.teiler_orchestrator_${PLATFORM}.rule=PathPrefix(`/${PLATFORM}-teiler`)"
-      - "traefik.http.services.teiler_orchestrator_${PLATFORM}.loadbalancer.server.port=9000"
-      - "traefik.http.routers.teiler_orchestrator_${PLATFORM}.tls=true"
-      - "traefik.http.middlewares.teiler_orchestrator_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-teiler"
-      - "traefik.http.routers.teiler_orchestrator_${PLATFORM}.middlewares=teiler_orchestrator_${PLATFORM}_strip"
+      - "traefik.http.routers.teiler_orchestrator_${PROJECT}.rule=PathPrefix(`/${PROJECT}-teiler`)"
+      - "traefik.http.services.teiler_orchestrator_${PROJECT}.loadbalancer.server.port=9000"
+      - "traefik.http.routers.teiler_orchestrator_${PROJECT}.tls=true"
+      - "traefik.http.middlewares.teiler_orchestrator_${PROJECT}_strip.stripprefix.prefixes=/${PROJECT}-teiler"
+      - "traefik.http.routers.teiler_orchestrator_${PROJECT}.middlewares=teiler_orchestrator_${PROJECT}_strip"
    environment:
-      TEILER_BACKEND_URL: "https://${HOST}/${PLATFORM}-teiler-backend"
-      TEILER_DASHBOARD_URL: "https://${HOST}/${PLATFORM}-teiler-dashboard"
+      TEILER_BACKEND_URL: "https://${HOST}/${PROJECT}-teiler-backend"
+      TEILER_DASHBOARD_URL: "https://${HOST}/${PROJECT}-teiler-dashboard"
      DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE_LOWER_CASE}"
-      HTTP_RELATIVE_PATH: "/${PLATFORM}-teiler"
+      HTTP_RELATIVE_PATH: "/${PROJECT}-teiler"

  teiler-dashboard:
    #image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:develop
@@ -24,14 +24,14 @@ services:
    container_name: bridgehead-teiler-dashboard
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.teiler_dashboard_${PLATFORM}.rule=PathPrefix(`/${PLATFORM}-teiler-dashboard`)"
-      - "traefik.http.services.teiler_dashboard_${PLATFORM}.loadbalancer.server.port=80"
-      - "traefik.http.routers.teiler_dashboard_${PLATFORM}.tls=true"
-      - "traefik.http.middlewares.teiler_dashboard_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-teiler-dashboard"
-      - "traefik.http.routers.teiler_dashboard_${PLATFORM}.middlewares=teiler_dashboard_${PLATFORM}_strip"
+      - "traefik.http.routers.teiler_dashboard_${PROJECT}.rule=PathPrefix(`/${PROJECT}-teiler-dashboard`)"
+      - "traefik.http.services.teiler_dashboard_${PROJECT}.loadbalancer.server.port=80"
+      - "traefik.http.routers.teiler_dashboard_${PROJECT}.tls=true"
+      - "traefik.http.middlewares.teiler_dashboard_${PROJECT}_strip.stripprefix.prefixes=/${PROJECT}-teiler-dashboard"
+      - "traefik.http.routers.teiler_dashboard_${PROJECT}.middlewares=teiler_dashboard_${PROJECT}_strip"
    environment:
      DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}"
-      TEILER_BACKEND_URL: "https://${HOST}/${PLATFORM}-teiler-backend"
+      TEILER_BACKEND_URL: "https://${HOST}/${PROJECT}-teiler-backend"
      OIDC_URL: "${OIDC_URL}"
      OIDC_REALM: "${OIDC_REALM}"
      OIDC_CLIENT_ID: "${OIDC_PUBLIC_CLIENT_ID}"
@@ -41,13 +41,13 @@ services:
      TEILER_ADMIN_PHONE: "${OPERATOR_PHONE}"
      TEILER_PROJECT: "${PROJECT}"
      EXPORTER_API_KEY: "${EXPORTER_API_KEY}"
-      TEILER_ORCHESTRATOR_URL: "https://${HOST}/${PLATFORM}-teiler"
-      TEILER_DASHBOARD_HTTP_RELATIVE_PATH: "/${PLATFORM}-teiler-dashboard"
-      TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/${PLATFORM}-teiler"
+      TEILER_ORCHESTRATOR_URL: "https://${HOST}/${PROJECT}-teiler"
+      TEILER_DASHBOARD_HTTP_RELATIVE_PATH: "/${PROJECT}-teiler-dashboard"
+      TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/${PROJECT}-teiler"
      TEILER_USER: "${OIDC_USER_GROUP}"
      TEILER_ADMIN: "${OIDC_ADMIN_GROUP}"
-      REPORTER_DEFAULT_TEMPLATE_ID: "${PLATFORM}-qb"
-      EXPORTER_DEFAULT_TEMPLATE_ID: "${PLATFORM}"
+      REPORTER_DEFAULT_TEMPLATE_ID: "${PROJECT}-qb"
+      EXPORTER_DEFAULT_TEMPLATE_ID: "${PROJECT}"


  teiler-backend:
@@ -55,21 +55,21 @@ services:
    container_name: bridgehead-teiler-backend
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.teiler_backend_${PLATFORM}.rule=PathPrefix(`/${PLATFORM}-teiler-backend`)"
-      - "traefik.http.services.teiler_backend_${PLATFORM}.loadbalancer.server.port=8085"
-      - "traefik.http.routers.teiler_backend_${PLATFORM}.tls=true"
-      - "traefik.http.middlewares.teiler_backend_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-teiler-backend"
-      - "traefik.http.routers.teiler_backend_${PLATFORM}.middlewares=teiler_backend_${PLATFORM}_strip"
+      - "traefik.http.routers.teiler_backend_${PROJECT}.rule=PathPrefix(`/${PROJECT}-teiler-backend`)"
+      - "traefik.http.services.teiler_backend_${PROJECT}.loadbalancer.server.port=8085"
+      - "traefik.http.routers.teiler_backend_${PROJECT}.tls=true"
+      - "traefik.http.middlewares.teiler_backend_${PROJECT}_strip.stripprefix.prefixes=/${PROJECT}-teiler-backend"
+      - "traefik.http.routers.teiler_backend_${PROJECT}.middlewares=teiler_backend_${PROJECT}_strip"
    environment:
      LOG_LEVEL: "INFO"
      APPLICATION_PORT: "8085"
      APPLICATION_ADDRESS: "${HOST}"
      DEFAULT_LANGUAGE: "${TEILER_DEFAULT_LANGUAGE}"
      CONFIG_ENV_VAR_PATH: "/run/secrets/project-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"
+      TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/${PROJECT}-teiler"
+      TEILER_ORCHESTRATOR_URL: "https://${HOST}/${PROJECT}-teiler"
+      TEILER_DASHBOARD_DE_URL: "https://${HOST}/${PROJECT}-teiler-dashboard/de"
+      TEILER_DASHBOARD_EN_URL: "https://${HOST}/${PROJECT}-teiler-dashboard/en"
      CENTRAX_URL: "${CENTRAXX_URL}"
      HTTP_PROXY: "http://forward_proxy:3128"
      ENABLE_MTBA: "${ENABLE_MTBA}"
--- a/minimal/modules/teiler-setup.sh
+++ b/minimal/modules/teiler-setup.sh
@@ -5,5 +5,5 @@ if [ "$ENABLE_TEILER" == true ];then
  OVERRIDE+=" -f ./$PROJECT/modules/teiler-compose.yml"
  TEILER_DEFAULT_LANGUAGE=DE
  TEILER_DEFAULT_LANGUAGE_LOWER_CASE=${TEILER_DEFAULT_LANGUAGE,,}
-  add_public_oidc_redirect_url "/${PLATFORM}-teiler/*"
+  add_public_oidc_redirect_url "/${PROJECT}-teiler/*"
 fi