mirror of
https://github.com/samply/bridgehead.git
synced 2026-06-23 10:30:17 +02:00
use it in ccp as well
This commit is contained in:
@@ -12,7 +12,7 @@ services:
|
|||||||
PROXY_URL: http://beam-proxy:8081
|
PROXY_URL: http://beam-proxy:8081
|
||||||
PROXY_APIKEY: ${DNPM_BEAM_SECRET_SHORT}
|
PROXY_APIKEY: ${DNPM_BEAM_SECRET_SHORT}
|
||||||
APP_ID: dnpm-connect.${PROXY_ID}
|
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"
|
LOCAL_TARGETS_FILE: "/conf/connect_targets.json"
|
||||||
HTTP_PROXY: "http://forward_proxy:3128"
|
HTTP_PROXY: "http://forward_proxy:3128"
|
||||||
HTTPS_PROXY: "http://forward_proxy:3128"
|
HTTPS_PROXY: "http://forward_proxy:3128"
|
||||||
@@ -25,7 +25,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
|
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
|
||||||
- /etc/bridgehead/dnpm/local_targets.json:/conf/connect_targets.json: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:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.routers.dnpm-connect.rule=PathPrefix(`/dnpm-connect`)"
|
- "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.services.dnpm-connect.loadbalancer.server.port=8062"
|
||||||
- "traefik.http.routers.dnpm-connect.tls=true"
|
- "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:
|
dnpm-echo:
|
||||||
image: docker.verbis.dkfz.de/cache/samply/bridgehead-echo:latest
|
image: docker.verbis.dkfz.de/cache/samply/bridgehead-echo:latest
|
||||||
container_name: bridgehead-dnpm-echo
|
container_name: bridgehead-dnpm-echo
|
||||||
|
|||||||
@@ -12,4 +12,9 @@ if [ -n "${ENABLE_DNPM}" ]; then
|
|||||||
else
|
else
|
||||||
DNPM_ADDITIONAL_NO_PROXY=""
|
DNPM_ADDITIONAL_NO_PROXY=""
|
||||||
fi
|
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
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user