mirror of
https://github.com/samply/bridgehead.git
synced 2025-06-16 15:00:15 +02:00
Compare commits
5 Commits
test/obds2
...
feature/co
Author | SHA1 | Date | |
---|---|---|---|
7837d3b542 | |||
d832cfdd43 | |||
4537617cd0 | |||
6fa587fe4f | |||
48d9a034c7 |
@ -22,6 +22,7 @@ services:
|
|||||||
BROKER_URL: ${ERIC_BROKER_URL}
|
BROKER_URL: ${ERIC_BROKER_URL}
|
||||||
PROXY_ID: ${ERIC_PROXY_ID}
|
PROXY_ID: ${ERIC_PROXY_ID}
|
||||||
APP_focus_KEY: ${ERIC_FOCUS_BEAM_SECRET_SHORT}
|
APP_focus_KEY: ${ERIC_FOCUS_BEAM_SECRET_SHORT}
|
||||||
|
APP_monitoring_KEY: ${ERIC_MONITORING_BEAM_SECRET_SHORT}
|
||||||
PRIVKEY_FILE: /run/secrets/proxy.pem
|
PRIVKEY_FILE: /run/secrets/proxy.pem
|
||||||
ALL_PROXY: http://forward_proxy:3128
|
ALL_PROXY: http://forward_proxy:3128
|
||||||
TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
|
TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
|
||||||
@ -34,3 +35,12 @@ services:
|
|||||||
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
|
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
|
||||||
- /srv/docker/bridgehead/bbmri/modules/eric.root.crt.pem:/conf/root.crt.pem:ro
|
- /srv/docker/bridgehead/bbmri/modules/eric.root.crt.pem:/conf/root.crt.pem:ro
|
||||||
|
|
||||||
|
bridgehead-monitoring:
|
||||||
|
image: docker.verbis.dkfz.de/cache/samply/bridgehead-monitoring:latest
|
||||||
|
container_name: bridgehead-monitoring-eric
|
||||||
|
environment:
|
||||||
|
- BEAM_ID=monitoring.${ERIC_PROXY_ID}
|
||||||
|
- BEAM_API_KEY=${ERIC_MONITORING_BEAM_SECRET_SHORT}
|
||||||
|
- BEAM_PROXY_URL=http://beam-proxy-eric:8081
|
||||||
|
depends_on:
|
||||||
|
- beam-proxy-eric
|
||||||
|
@ -10,4 +10,7 @@ if [ "${ENABLE_ERIC}" == "true" ]; then
|
|||||||
ERIC_PROXY_ID=${SITE_ID}.${ERIC_BROKER_ID}
|
ERIC_PROXY_ID=${SITE_ID}.${ERIC_BROKER_ID}
|
||||||
ERIC_FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
|
ERIC_FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
|
||||||
ERIC_SUPPORT_EMAIL=bridgehead@helpdesk.bbmri-eric.eu
|
ERIC_SUPPORT_EMAIL=bridgehead@helpdesk.bbmri-eric.eu
|
||||||
|
|
||||||
|
#Monitoring
|
||||||
|
ERIC_MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
|
||||||
fi
|
fi
|
||||||
|
@ -22,6 +22,7 @@ services:
|
|||||||
BROKER_URL: ${GBN_BROKER_URL}
|
BROKER_URL: ${GBN_BROKER_URL}
|
||||||
PROXY_ID: ${GBN_PROXY_ID}
|
PROXY_ID: ${GBN_PROXY_ID}
|
||||||
APP_focus_KEY: ${GBN_FOCUS_BEAM_SECRET_SHORT}
|
APP_focus_KEY: ${GBN_FOCUS_BEAM_SECRET_SHORT}
|
||||||
|
APP_monitoring_KEY: ${GBN_MONITORING_BEAM_SECRET_SHORT}
|
||||||
PRIVKEY_FILE: /run/secrets/proxy.pem
|
PRIVKEY_FILE: /run/secrets/proxy.pem
|
||||||
ALL_PROXY: http://forward_proxy:3128
|
ALL_PROXY: http://forward_proxy:3128
|
||||||
TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
|
TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
|
||||||
@ -34,3 +35,13 @@ services:
|
|||||||
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
|
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
|
||||||
- /srv/docker/bridgehead/bbmri/modules/gbn.root.crt.pem:/conf/root.crt.pem:ro
|
- /srv/docker/bridgehead/bbmri/modules/gbn.root.crt.pem:/conf/root.crt.pem:ro
|
||||||
|
|
||||||
|
bridgehead-monitoring:
|
||||||
|
image: docker.verbis.dkfz.de/cache/samply/bridgehead-monitoring:latest
|
||||||
|
container_name: bridgehead-monitoring-gbn
|
||||||
|
environment:
|
||||||
|
- BEAM_ID=monitoring.${GBN_PROXY_ID}
|
||||||
|
- BEAM_API_KEY=${GBN_MONITORING_BEAM_SECRET_SHORT}
|
||||||
|
- BEAM_PROXY_URL=http://beam-proxy-gbn:8081
|
||||||
|
depends_on:
|
||||||
|
- beam-proxy-gbn
|
||||||
|
|
||||||
|
@ -10,4 +10,7 @@ if [ "${ENABLE_GBN}" == "true" ]; then
|
|||||||
GBN_PROXY_ID=${SITE_ID}.${GBN_BROKER_ID}
|
GBN_PROXY_ID=${SITE_ID}.${GBN_BROKER_ID}
|
||||||
GBN_FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
|
GBN_FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
|
||||||
GBN_SUPPORT_EMAIL=feedback@germanbiobanknode.de
|
GBN_SUPPORT_EMAIL=feedback@germanbiobanknode.de
|
||||||
|
|
||||||
|
#Monitoring
|
||||||
|
GBN_MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
|
||||||
fi
|
fi
|
||||||
|
@ -40,6 +40,7 @@ services:
|
|||||||
BROKER_URL: ${BROKER_URL}
|
BROKER_URL: ${BROKER_URL}
|
||||||
PROXY_ID: ${PROXY_ID}
|
PROXY_ID: ${PROXY_ID}
|
||||||
APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT}
|
APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT}
|
||||||
|
APP_monitoring_KEY: ${CCP_MONITORING_BEAM_SECRET_SHORT}
|
||||||
PRIVKEY_FILE: /run/secrets/proxy.pem
|
PRIVKEY_FILE: /run/secrets/proxy.pem
|
||||||
ALL_PROXY: http://forward_proxy:3128
|
ALL_PROXY: http://forward_proxy:3128
|
||||||
TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
|
TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
|
||||||
@ -51,6 +52,16 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
|
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
|
||||||
- /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro
|
- /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro
|
||||||
|
|
||||||
|
bridgehead-monitoring:
|
||||||
|
image: docker.verbis.dkfz.de/cache/samply/bridgehead-monitoring:latest
|
||||||
|
container_name: bridgehead-monitoring-ccp
|
||||||
|
environment:
|
||||||
|
- BEAM_ID=monitoring.${PROXY_ID}
|
||||||
|
- BEAM_API_KEY=${CCP_MONITORING_BEAM_SECRET_SHORT}
|
||||||
|
- BEAM_PROXY_URL=http://beam-proxy:8081
|
||||||
|
depends_on:
|
||||||
|
- beam-proxy
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
|
2
ccp/modules/ccp-setup.sh
Normal file
2
ccp/modules/ccp-setup.sh
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#Monitoring
|
||||||
|
CCP_MONITORING_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
|
Reference in New Issue
Block a user