diff --git a/ccp/exliquid-compose.yml b/ccp/exliquid-compose.yml deleted file mode 100644 index becf99a..0000000 --- a/ccp/exliquid-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: "3.7" - -services: - exliquid-task-store: - image: docker.verbis.dkfz.de/cache/samply/blaze:0.20 - container_name: bridgehead-exliquid-task-store - environment: - BASE_URL: "http://bridgehead-exliquid-task-store:8080" - JAVA_TOOL_OPTIONS: "-Xmx1g" - volumes: - - "exliquid-task-store-data:/app/data" - labels: - - "traefik.enable=false" - - exliquid-report-hub: - image: docker.verbis.dkfz.de/cache/samply/report-hub:latest - container_name: bridgehead-exliquid-report-hub - environment: - SPRING_WEBFLUX_BASE_PATH: "/exliquid" - JAVA_TOOL_OPTIONS: "-Xmx1g" - APP_BEAM_APPID: "report-hub.${PROXY_ID}" - APP_BEAM_SECRET: ${REPORTHUB_BEAM_SECRET_SHORT} - APP_BEAM_PROXY_BASEURL: http://beam-proxy:8081 - APP_TASKSTORE_BASEURL: "http://bridgehead-exliquid-task-store:8080/fhir" - APP_DATASTORE_BASEURL: http://bridgehead-ccp-blaze:8080/fhir - restart: always - labels: - - "traefik.enable=true" - - "traefik.http.routers.report-ccp.rule=PathPrefix(`/exliquid`)" - - "traefik.http.services.report-ccp.loadbalancer.server.port=8080" - - "traefik.http.routers.report-ccp.tls=true" - -volumes: - exliquid-task-store-data: \ No newline at end of file diff --git a/ccp/exliquid-setup.sh b/ccp/exliquid-setup.sh deleted file mode 100644 index 91909eb..0000000 --- a/ccp/exliquid-setup.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -function exliquidSetup() { - case ${SITE_ID} in - berlin|dresden|essen|frankfurt|freiburg|luebeck|mainz|muenchen-lmu|muenchen-tum|mannheim|tuebingen) - EXLIQUID=1 - ;; - dktk-test) - EXLIQUID=1 - ;; - *) - EXLIQUID=0 - ;; - esac - if [[ $EXLIQUID -eq 1 ]]; then - log INFO "EXLIQUID setup detected -- will start Report-Hub." - OVERRIDE+=" -f ./$PROJECT/exliquid-compose.yml" - fi -} \ No newline at end of file diff --git a/ccp/vars b/ccp/vars index f3ef8ce..b642a9d 100644 --- a/ccp/vars +++ b/ccp/vars @@ -15,8 +15,6 @@ idManagementSetup source $PROJECT/nngm-setup.sh nngmSetup -source $PROJECT/exliquid-setup.sh -exliquidSetup mtbaSetup for module in $PROJECT/modules/*.sh