From ada3226044759e6ec110c68dd7a0a147eaa3b575 Mon Sep 17 00:00:00 2001 From: djuarezgf <46350150+djuarezgf@users.noreply.github.com> Date: Wed, 30 Jul 2025 11:21:10 +0200 Subject: [PATCH 1/4] Replace hardcoded image: ...:develop references with version variables (#335) * added: Teiler Dashboard Version * added: MTBA Version * added: beam proxy tag version --- bbmri/modules/teiler-compose.yml | 2 +- cce/modules/teiler-compose.yml | 2 +- ccp/modules/mtba-compose.yml | 2 +- ccp/modules/teiler-compose.yml | 2 +- dhki/docker-compose.yml | 2 +- kr/docker-compose.yml | 2 +- kr/modules/teiler-compose.yml | 2 +- versions/acceptance | 4 +++- versions/prod | 4 +++- versions/test | 4 +++- 10 files changed, 16 insertions(+), 10 deletions(-) diff --git a/bbmri/modules/teiler-compose.yml b/bbmri/modules/teiler-compose.yml index 33274a2..e241b9c 100644 --- a/bbmri/modules/teiler-compose.yml +++ b/bbmri/modules/teiler-compose.yml @@ -19,7 +19,7 @@ services: HTTP_RELATIVE_PATH: "/bbmri-teiler" teiler-dashboard: - image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:develop + image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:${TEILER_DASHBOARD_TAG} container_name: bridgehead-teiler-dashboard labels: - "traefik.enable=true" diff --git a/cce/modules/teiler-compose.yml b/cce/modules/teiler-compose.yml index a2845bf..5bfcd2d 100644 --- a/cce/modules/teiler-compose.yml +++ b/cce/modules/teiler-compose.yml @@ -19,7 +19,7 @@ services: HTTP_RELATIVE_PATH: "/cce-teiler" teiler-dashboard: - image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:develop + image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:${TEILER_DASHBOARD_TAG} container_name: bridgehead-teiler-dashboard labels: - "traefik.enable=true" diff --git a/ccp/modules/mtba-compose.yml b/ccp/modules/mtba-compose.yml index 1c01340..6bf6dc4 100644 --- a/ccp/modules/mtba-compose.yml +++ b/ccp/modules/mtba-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: mtba: - image: docker.verbis.dkfz.de/cache/samply/mtba:develop + image: docker.verbis.dkfz.de/cache/samply/mtba:${MTBA_TAG} container_name: bridgehead-mtba environment: BLAZE_STORE_URL: http://blaze:8080 diff --git a/ccp/modules/teiler-compose.yml b/ccp/modules/teiler-compose.yml index 15dbd08..b6fc4c6 100644 --- a/ccp/modules/teiler-compose.yml +++ b/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:develop + image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:${TEILER_DASHBOARD_TAG} container_name: bridgehead-teiler-dashboard labels: - "traefik.enable=true" diff --git a/dhki/docker-compose.yml b/dhki/docker-compose.yml index c8df043..17d33eb 100644 --- a/dhki/docker-compose.yml +++ b/dhki/docker-compose.yml @@ -39,7 +39,7 @@ services: - "blaze" beam-proxy: - image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop + image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG} container_name: bridgehead-beam-proxy environment: BROKER_URL: ${BROKER_URL} diff --git a/kr/docker-compose.yml b/kr/docker-compose.yml index 2d5390a..98632bd 100644 --- a/kr/docker-compose.yml +++ b/kr/docker-compose.yml @@ -40,7 +40,7 @@ services: - "blaze" beam-proxy: - image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop + image: docker.verbis.dkfz.de/cache/samply/beam-proxy:${BEAM_TAG} container_name: bridgehead-beam-proxy environment: BROKER_URL: ${BROKER_URL} diff --git a/kr/modules/teiler-compose.yml b/kr/modules/teiler-compose.yml index db42513..fd71514 100644 --- a/kr/modules/teiler-compose.yml +++ b/kr/modules/teiler-compose.yml @@ -19,7 +19,7 @@ services: HTTP_RELATIVE_PATH: "/kr-teiler" teiler-dashboard: - image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:develop + image: docker.verbis.dkfz.de/cache/samply/teiler-dashboard:${TEILER_DASHBOARD_TAG} container_name: bridgehead-teiler-dashboard labels: - "traefik.enable=true" diff --git a/versions/acceptance b/versions/acceptance index c4c9d5c..1c6a5ed 100644 --- a/versions/acceptance +++ b/versions/acceptance @@ -1,4 +1,6 @@ FOCUS_TAG=develop BEAM_TAG=develop BLAZE_TAG=main -POSTGRES_TAG=15.13-alpine \ No newline at end of file +POSTGRES_TAG=15.13-alpine +TEILER_DASHBOARD_TAG=develop +MTBA_TAG=develop \ No newline at end of file diff --git a/versions/prod b/versions/prod index affa1a1..7f6642d 100644 --- a/versions/prod +++ b/versions/prod @@ -1,4 +1,6 @@ FOCUS_TAG=main BEAM_TAG=main BLAZE_TAG=0.32 -POSTGRES_TAG=15.13-alpine \ No newline at end of file +POSTGRES_TAG=15.13-alpine +TEILER_DASHBOARD_TAG=main +MTBA_TAG=main \ No newline at end of file diff --git a/versions/test b/versions/test index c4c9d5c..1c6a5ed 100644 --- a/versions/test +++ b/versions/test @@ -1,4 +1,6 @@ FOCUS_TAG=develop BEAM_TAG=develop BLAZE_TAG=main -POSTGRES_TAG=15.13-alpine \ No newline at end of file +POSTGRES_TAG=15.13-alpine +TEILER_DASHBOARD_TAG=develop +MTBA_TAG=develop \ No newline at end of file From d0851d80a05b627adddb38e793e55b5aa49177a5 Mon Sep 17 00:00:00 2001 From: Jan <59206115+Threated@users.noreply.github.com> Date: Tue, 19 Aug 2025 15:48:05 +0200 Subject: [PATCH 2/4] fix: adapt to transfair cli changes (#319) --- modules/transfair-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/transfair-compose.yml b/modules/transfair-compose.yml index d2027fb..865f1d3 100644 --- a/modules/transfair-compose.yml +++ b/modules/transfair-compose.yml @@ -10,7 +10,6 @@ services: - TTP_GW_SOURCE - TTP_GW_EPIX_DOMAIN - TTP_GW_GPAS_DOMAIN - - TTP_TYPE - TTP_AUTH - PROJECT_ID_SYSTEM - FHIR_REQUEST_URL=${FHIR_REQUEST_URL} @@ -26,6 +25,7 @@ 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 From 4407a876443003aa12fbd9e2164d1f675f2a906a Mon Sep 17 00:00:00 2001 From: Jan <59206115+Threated@users.noreply.github.com> Date: Tue, 19 Aug 2025 16:32:41 +0200 Subject: [PATCH 3/4] chore: add more options to transfair (#325) --- modules/transfair-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/transfair-compose.yml b/modules/transfair-compose.yml index 865f1d3..e827603 100644 --- a/modules/transfair-compose.yml +++ b/modules/transfair-compose.yml @@ -10,6 +10,7 @@ services: - TTP_GW_SOURCE - TTP_GW_EPIX_DOMAIN - TTP_GW_GPAS_DOMAIN + - TTP_GW_GPAS_URL - TTP_AUTH - PROJECT_ID_SYSTEM - FHIR_REQUEST_URL=${FHIR_REQUEST_URL} From e0754853d89df0ed3ad3d24d1e2c5e1fc40e460c Mon Sep 17 00:00:00 2001 From: Jan <59206115+Threated@users.noreply.github.com> Date: Tue, 19 Aug 2025 16:35:52 +0200 Subject: [PATCH 4/4] feat(dnpm): change to new `api-gateway` image (#337) --- ccp/modules/dnpm-node-compose.yml | 2 +- minimal/modules/dnpm-node-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccp/modules/dnpm-node-compose.yml b/ccp/modules/dnpm-node-compose.yml index 10f6f1b..297ab5b 100644 --- a/ccp/modules/dnpm-node-compose.yml +++ b/ccp/modules/dnpm-node-compose.yml @@ -58,7 +58,7 @@ services: dnpm-backend: container_name: bridgehead-dnpm-backend - image: ghcr.io/dnpm-dip/backend:${DNPM_IMAGE_TAG:-latest} + image: ghcr.io/dnpm-dip/api-gateway: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} diff --git a/minimal/modules/dnpm-node-compose.yml b/minimal/modules/dnpm-node-compose.yml index cb7e524..4ec8c4b 100644 --- a/minimal/modules/dnpm-node-compose.yml +++ b/minimal/modules/dnpm-node-compose.yml @@ -58,7 +58,7 @@ services: dnpm-backend: container_name: bridgehead-dnpm-backend - image: ghcr.io/dnpm-dip/backend:${DNPM_IMAGE_TAG:-latest} + image: ghcr.io/dnpm-dip/api-gateway: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}