From babfff4f24c788019efddf240dd3ce63a2e1f3b7 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Tue, 25 Apr 2023 13:58:04 +0200 Subject: [PATCH] beam connect and move beam-connect config --- ccp/modules/datashield-compose.yml | 19 +++++++++++++++++++ ccp/modules/exporter-compose.yml | 4 ++-- lib/beam-connect/central.json | 5 ----- lib/beam-connect/local.json | 3 --- 4 files changed, 21 insertions(+), 10 deletions(-) delete mode 100644 lib/beam-connect/central.json delete mode 100644 lib/beam-connect/local.json diff --git a/ccp/modules/datashield-compose.yml b/ccp/modules/datashield-compose.yml index 9ba14ee..d3e63f2 100644 --- a/ccp/modules/datashield-compose.yml +++ b/ccp/modules/datashield-compose.yml @@ -81,6 +81,25 @@ services: container_name: bridgehead-opal-rserver image: datashield/rock-base:6.2-R4.2 # https://datashield.discourse.group/t/ds-aggregate-method-error/416/4 + beam-connect: + image: docker.verbis.dkfz.de/cache/samply/beam-connect:develop + container_name: bridgehead-datashield-connect + environment: + PROXY_URL: "http://beam-proxy:8081" + APP_ID: datashield-connect + PROXY_APIKEY: ${DATASHIELD_CONNECT_SECRET} + DISCOVERY_URL: "./map/central.json" + LOCAL_TARGETS_FILE: "./map/local.json" + depends_on: + - "beam-proxy" + volumes: + - /etc/bridgehead/datashield-connect/:/map:ro + + beam-proxy: + environment: + APP_2_ID: datashield-connect + APP_2_KEY: ${DATASHIELD_CONNECT_SECRET} + volumes: # bridgehead-rstudio-config: # name: "bridgehead-rstudio-config" diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml index b15bf10..a4881d2 100644 --- a/ccp/modules/exporter-compose.yml +++ b/ccp/modules/exporter-compose.yml @@ -2,8 +2,8 @@ version: "3.7" services: exporter: - #image: docker.verbis.dkfz.de/ccp/dktk-exporter:latest - image: dktk-exporter + image: docker.verbis.dkfz.de/ccp/dktk-exporter:latest + #image: dktk-exporter container_name: bridgehead-ccp-exporter environment: LOG_LEVEL: "INFO" diff --git a/lib/beam-connect/central.json b/lib/beam-connect/central.json deleted file mode 100644 index f9dc6c7..0000000 --- a/lib/beam-connect/central.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sites": [ - // TODO: Add remote sites e.g: https://github.com/samply/beam-connect/blob/main/examples/example_central_test.json - ] -} diff --git a/lib/beam-connect/local.json b/lib/beam-connect/local.json deleted file mode 100644 index 4b59829..0000000 --- a/lib/beam-connect/local.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - // TODO: Add local config e.g: https://github.com/samply/beam-connect/blob/main/examples/example_local_test.json -]