From 8f3d2f0947c0c25641d1c7ebc0291b678fca8211 Mon Sep 17 00:00:00 2001 From: Enola Knezevic Date: Wed, 22 Mar 2023 11:26:55 +0100 Subject: [PATCH 1/2] replace local spot with focus --- bbmri/docker-compose.yml | 14 +++++++------- bbmri/vars | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml index 6a6d0a8..eb30a34 100644 --- a/bbmri/docker-compose.yml +++ b/bbmri/docker-compose.yml @@ -71,12 +71,12 @@ services: - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,auth" - "traefik.http.routers.blaze_ccp.tls=true" - spot: - image: docker.verbis.dkfz.de/cache/samply/spot:latest - container_name: bridgehead-spot + focus: + image: docker.verbis.dkfz.de/cache/samply/focus:develop + container_name: bridgehead-focus environment: - SECRET: ${SPOT_BEAM_SECRET_LONG} - APPID: spot + API_KEY: ${FOCUS_BEAM_SECRET_SHORT} + APP_ID: focus PROXY_ID: ${PROXY_ID} LDM_URL: http://bridgehead-bbmri-blaze:8080/fhir BEAM_PROXY: http://beam-proxy:8081 @@ -90,8 +90,8 @@ services: environment: BROKER_URL: ${BROKER_URL} PROXY_ID: ${PROXY_ID} - APP_0_ID: spot - APP_0_KEY: ${SPOT_BEAM_SECRET_SHORT} + APP_0_ID: focus + APP_0_KEY: ${FOCUS_BEAM_SECRET_SHORT} PRIVKEY_FILE: /run/secrets/proxy.pem ALL_PROXY: http://forward_proxy:3128 TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs diff --git a/bbmri/vars b/bbmri/vars index 6fb693d..5803ac5 100644 --- a/bbmri/vars +++ b/bbmri/vars @@ -1,7 +1,6 @@ BROKER_ID=broker.bbmri.samply.de BROKER_URL=https://${BROKER_ID} PROXY_ID=${SITE_ID}.${BROKER_ID} -SPOT_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" -SPOT_BEAM_SECRET_LONG="ApiKey spot.${PROXY_ID} ${SPOT_BEAM_SECRET_SHORT}" +FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" SUPPORT_EMAIL=bridgehead@helpdesk.bbmri-eric.eu PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem From 1c3785ace7579b9ab877d5edb6d5f4dc4860dda9 Mon Sep 17 00:00:00 2001 From: Enola Knezevic Date: Wed, 22 Mar 2023 11:37:48 +0100 Subject: [PATCH 2/2] added missing variables and renamed correctly --- bbmri/docker-compose.yml | 7 ++++--- bbmri/vars | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml index eb30a34..348166c 100644 --- a/bbmri/docker-compose.yml +++ b/bbmri/docker-compose.yml @@ -76,10 +76,11 @@ services: container_name: bridgehead-focus environment: API_KEY: ${FOCUS_BEAM_SECRET_SHORT} - APP_ID: focus + BEAM_APP_ID: focus PROXY_ID: ${PROXY_ID} - LDM_URL: http://bridgehead-bbmri-blaze:8080/fhir - BEAM_PROXY: http://beam-proxy:8081 + BLAZE_URL: http://bridgehead-bbmri-blaze:8080/fhir + BEAM_PROXY_URL: http://beam-proxy:8081 + RETRY_COUNT: ${FOCUS_RETRY_COUNT} depends_on: - "beam-proxy" - "blaze" diff --git a/bbmri/vars b/bbmri/vars index 5803ac5..34995ed 100644 --- a/bbmri/vars +++ b/bbmri/vars @@ -2,5 +2,6 @@ BROKER_ID=broker.bbmri.samply.de BROKER_URL=https://${BROKER_ID} PROXY_ID=${SITE_ID}.${BROKER_ID} FOCUS_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)" +FOCUS_RETRY_COUNT=32 SUPPORT_EMAIL=bridgehead@helpdesk.bbmri-eric.eu -PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem +PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem \ No newline at end of file