From 6538a09843e28cd3d8623c6eacc83f1714311f50 Mon Sep 17 00:00:00 2001 From: Threated Date: Mon, 22 Jun 2026 11:21:08 +0200 Subject: [PATCH] use it in ccp as well --- ccp/modules/dnpm-compose.yml | 13 +++++++++++-- ccp/modules/dnpm-setup.sh | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ccp/modules/dnpm-compose.yml b/ccp/modules/dnpm-compose.yml index 0ce7f745..a1b2d245 100644 --- a/ccp/modules/dnpm-compose.yml +++ b/ccp/modules/dnpm-compose.yml @@ -12,7 +12,7 @@ services: PROXY_URL: http://beam-proxy:8081 PROXY_APIKEY: ${DNPM_BEAM_SECRET_SHORT} APP_ID: dnpm-connect.${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" @@ -25,7 +25,6 @@ services: volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - /etc/bridgehead/dnpm/local_targets.json:/conf/connect_targets.json:ro - - /srv/docker/bridgehead/minimal/modules/dnpm-central-targets.json:/conf/central_targets.json:ro labels: - "traefik.enable=true" - "traefik.http.routers.dnpm-connect.rule=PathPrefix(`/dnpm-connect`)" @@ -34,6 +33,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.${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/ccp/modules/dnpm-setup.sh b/ccp/modules/dnpm-setup.sh index 9ca47678..369cd535 100644 --- a/ccp/modules/dnpm-setup.sh +++ b/ccp/modules/dnpm-setup.sh @@ -12,4 +12,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