Change beam-connect version and load opal cert

This commit is contained in:
janskiba 2023-05-24 08:51:12 +00:00 committed by juarez
parent f2f48869af
commit 6438fc5f4e
1 changed files with 7 additions and 3 deletions

View File

@ -69,16 +69,19 @@ services:
image: datashield/rock-base:6.2-R4.2 # https://datashield.discourse.group/t/ds-aggregate-method-error/416/4 image: datashield/rock-base:6.2-R4.2 # https://datashield.discourse.group/t/ds-aggregate-method-error/416/4
beam-connect: beam-connect:
image: docker.verbis.dkfz.de/cache/samply/beam-connect:develop image: docker.verbis.dkfz.de/cache/samply/beam-connect:fix-connect
container_name: bridgehead-datashield-connect container_name: bridgehead-datashield-connect
ports: ports:
- 8062:8062 - 8062:8062
environment: environment:
PROXY_URL: "http://beam-proxy:8081" PROXY_URL: "http://beam-proxy:8081"
TLS_CA_CERTIFICATES_DIR: /run/secrets
APP_ID: datashield-connect.${SITE_ID}.${BROKER_ID} APP_ID: datashield-connect.${SITE_ID}.${BROKER_ID}
PROXY_APIKEY: ${DATASHIELD_CONNECT_SECRET} PROXY_APIKEY: ${DATASHIELD_CONNECT_SECRET}
DISCOVERY_URL: "./map/central.json" DISCOVERY_URL: "./map/central.json"
LOCAL_TARGETS_FILE: "./map/local.json" LOCAL_TARGETS_FILE: "./map/local.json"
secrets:
- opal-cert.pem
depends_on: depends_on:
- beam-proxy - beam-proxy
volumes: volumes:
@ -101,6 +104,7 @@ services:
secrets: secrets:
opal-cert.pem: opal-cert.pem:
file: /etc/bridgehead/traefik-tls/opal-cert.pem file: /etc/bridgehead/trusted-ca-certs/opal-cert.pem:ro
opal-key.pem: opal-key.pem:
file: /etc/bridgehead/traefik-tls/opal-key.pem file: /etc/bridgehead/trusted-ca-certs/opal-key.pem:ro