From ce6f7de4be1f870782876e46e2485968ff7cddea Mon Sep 17 00:00:00 2001 From: Skiba Jan Date: Wed, 6 May 2026 15:32:19 +0200 Subject: [PATCH] add dnpm broker connector --- minimal/modules/dnpm-compose.yml | 12 +++++++++++- minimal/modules/dnpm-setup.sh | 5 +++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/minimal/modules/dnpm-compose.yml b/minimal/modules/dnpm-compose.yml index 1c9a36aa..a5091f2c 100644 --- a/minimal/modules/dnpm-compose.yml +++ b/minimal/modules/dnpm-compose.yml @@ -28,7 +28,7 @@ services: PROXY_URL: http://dnpm-beam-proxy:8081 PROXY_APIKEY: ${DNPM_BEAM_SECRET_SHORT} APP_ID: dnpm-connect.${DNPM_PROXY_ID} - DISCOVERY_URL: "./conf/central_targets.json" + DISCOVERY_URL: "http://dnpm-broker-connector:8080/sites" LOCAL_TARGETS_FILE: "/conf/connect_targets.json" HTTP_PROXY: http://forward_proxy:3128 HTTPS_PROXY: http://forward_proxy:3128 @@ -50,6 +50,16 @@ services: - "traefik.http.services.dnpm-connect.loadbalancer.server.port=8062" - "traefik.http.routers.dnpm-connect.tls=true" + dnpm-broker-connector: + image: samply/dnpm-broker-connector:main + container_name: bridgehead-dnpm-broker-connector + command: serve-sites + environment: + BEAM_CONNECT_URL: "http://dnpm-beam-connect:8062" + BEAM_CONNECT_HOST: "${DNPM_BEAM_CONNECT_HOST}" + DNPM_BROKER_BEAM_ID: "dnpm-connect.dnpm-bridge.${DNPM_BROKER_ID}" + DNPM_BROKER_VHOST: "dnpm.de" + dnpm-echo: image: docker.verbis.dkfz.de/cache/samply/bridgehead-echo:latest container_name: bridgehead-dnpm-echo diff --git a/minimal/modules/dnpm-setup.sh b/minimal/modules/dnpm-setup.sh index 98d55f13..29625faa 100644 --- a/minimal/modules/dnpm-setup.sh +++ b/minimal/modules/dnpm-setup.sh @@ -19,4 +19,9 @@ if [ -n "${ENABLE_DNPM}" ]; then else DNPM_ADDITIONAL_NO_PROXY="" fi + if [ -n "${ENABLE_DNPM_NODE}" ]; then + DNPM_BEAM_CONNECT_HOST="${DNPM_BEAM_CONNECT_HOST:-$HOST}" + else + DNPM_BEAM_CONNECT_HOST="dnpm-beam-connect:8062" + fi fi