Test

ccp/modules/dnpm-node-compose.yml

@@ -58,7 +58,7 @@ services:
 
   dnpm-backend:
     container_name: bridgehead-dnpm-backend
-    image: ghcr.io/dnpm-dip/api-gateway:latest
+    image: ghcr.io/dnpm-dip/backend:${DNPM_IMAGE_TAG:-latest}
     environment:
       - LOCAL_SITE=${ZPM_SITE}:${SITE_NAME}   # Format: {Site-ID}:{Site-name}, e.g. UKT:Tübingen
       - RD_RANDOM_DATA=${DNPM_SYNTH_NUM:--1}

ccp/modules/teiler-compose.yml

@@ -19,7 +19,7 @@ services:
       HTTP_RELATIVE_PATH: "/ccp-teiler"
 
   teiler-dashboard:
-    image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:${TEILER_DASHBOARD_TAG}
+    image: docker.verbis.dkfz.de/ccp/samply/teiler-dashboard:test
     container_name: bridgehead-teiler-dashboard
     labels:
       - "traefik.enable=true"
@@ -42,14 +42,12 @@ services:
       EXPORTER_API_KEY: "${EXPORTER_API_KEY}"
       TEILER_ORCHESTRATOR_URL: "/ccp-teiler"
       TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/ccp-teiler"
-      TEILER_USER: "${OIDC_USER_GROUP}"
-      TEILER_ADMIN: "${OIDC_ADMIN_GROUP}"
       REPORTER_DEFAULT_TEMPLATE_ID: "ccp-qb"
       EXPORTER_DEFAULT_TEMPLATE_ID: "ccp"
 
 
   teiler-backend:
-    image: docker.verbis.dkfz.de/ccp/dktk-teiler-backend:latest
+    image: docker.verbis.dkfz.de/ccp/dktk-teiler-backend:test
     container_name: bridgehead-teiler-backend
     labels:
       - "traefik.enable=true"
@@ -70,3 +68,7 @@ services:
       ENABLE_MTBA: "${ENABLE_MTBA}"
       ENABLE_DATASHIELD: "${ENABLE_DATASHIELD}"
       IDMANAGER_UPLOAD_APIKEY: "${IDMANAGER_UPLOAD_APIKEY}" # Only used to check if the ID Manager is active
+      TEILER_ROLE_USER: "${OIDC_USER_GROUP}"
+      TEILER_ROLE_ADMIN: "${OIDC_ADMIN_GROUP}"
+      TEILER_ROLE_PSP: "${OIDC_PSP_GROUP}"
+

dhki/vars

@@ -24,4 +24,3 @@ do
 done
 
 transfairSetup
-scoutSetup

minimal/modules/dnpm-node-compose.yml

@@ -58,7 +58,7 @@ services:
 
   dnpm-backend:
     container_name: bridgehead-dnpm-backend
-    image: ghcr.io/dnpm-dip/api-gateway:latest
+    image: ghcr.io/dnpm-dip/backend:${DNPM_IMAGE_TAG:-latest}
     environment:
       - LOCAL_SITE=${ZPM_SITE}:${SITE_NAME}   # Format: {Site-ID}:{Site-name}, e.g. UKT:Tübingen
       - RD_RANDOM_DATA=${DNPM_SYNTH_NUM:--1}

modules/scout-compose.yml

@@ -1,40 +0,0 @@
-volumes:
-  scout-blaze-data:
-
-services:
-  traefik:
-    labels:
-      - "traefik.http.middlewares.additional-users-auth.basicauth.users=${SCOUT_BASIC_AUTH_USERS}"
-
-  scout-blaze:
-    image: docker.verbis.dkfz.de/cache/samply/blaze:${BLAZE_TAG}
-    container_name: bridgehead-scout-blaze
-    environment:
-      BASE_URL: "http://bridgehead-scout-blaze:8080"
-      ENFORCE_REFERENTIAL_INTEGRITY: "false"
-    volumes:
-      - "scout-blaze-data:/app/data"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.scout-blaze.rule=PathPrefix(`/scout-blaze`)"
-      - "traefik.http.middlewares.scout-blaze-stripprefix.stripprefix.prefixes=/scout-blaze"
-      - "traefik.http.services.scout-blaze.loadbalancer.server.port=8080"
-      - "traefik.http.routers.scout-blaze.middlewares=scout-blaze-stripprefix,additional-users-auth"
-      - "traefik.http.routers.scout-blaze.tls=true"
-
-  scout:
-    image: samply/scout:main
-    container_name: bridgehead-scout
-    configs:
-      - scout.toml
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.scout.rule=PathPrefix(`/scout`)"
-      - "traefik.http.services.scout.loadbalancer.server.port=8080"
-      - "traefik.http.routers.scout.middlewares=additional-users-auth"
-      - "traefik.http.routers.scout.tls=true"
-
-configs:
-  scout.toml:
-    content: |
-      fhir_base_url = "http://scout-blaze:8080/fhir"

modules/scout-setup.sh

@@ -1,8 +0,0 @@
-#!/bin/bash -e
-
-function scoutSetup() {
-    if [[ -n "$ENABLE_SCOUT" && -n "$SCOUT_BASIC_AUTH_USERS" ]]; then
-        echo "Starting scout."
-	    OVERRIDE+=" -f ./modules/scout-compose.yml"
-    fi
-}

modules/transfair-compose.yml

@@ -10,7 +10,7 @@ services:
       - TTP_GW_SOURCE
       - TTP_GW_EPIX_DOMAIN
       - TTP_GW_GPAS_DOMAIN
-      - TTP_GW_GPAS_URL
+      - TTP_TYPE
       - TTP_AUTH
       - PROJECT_ID_SYSTEM
       - FHIR_REQUEST_URL=${FHIR_REQUEST_URL}
@@ -26,7 +26,6 @@ services:
       - TLS_DISABLE=${TRANSFAIR_TLS_DISABLE:-false}
       - NO_PROXY=${TRANSFAIR_NO_PROXIES}
       - ALL_PROXY=http://forward_proxy:3128
-    command: dic ${TTP_TYPE}
     volumes:
       - /var/cache/bridgehead/${PROJECT}/transfair:/transfair
       - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro