Skip to content

add dnpm broker connector #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Threated wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

add dnpm broker connector #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2cd2ef
add dnpm broker connector
Threated May 6, 2026
d36e822
remove unused central targets json
Threated Jun 22, 2026
6538a09
use it in ccp as well
Threated Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ccp/modules/dnpm-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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`)"
Expand All @@ -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
5 changes: 5 additions & 0 deletions ccp/modules/dnpm-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
142 changes: 0 additions & 142 deletions minimal/modules/dnpm-central-targets.json
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 deletions minimal/modules/dnpm-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -41,7 +41,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`)"
Expand All @@ -50,6 +49,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
Expand Down
5 changes: 5 additions & 0 deletions minimal/modules/dnpm-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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