From b061bf635039803736066367c154aad8be6c862e Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Mon, 5 Dec 2022 13:18:14 +0100 Subject: [PATCH] Fixed compose file for exliquid --- ccp/exliquid-compose.yml | 8 +++----- ccp/exliquid-setup.sh | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ccp/exliquid-compose.yml b/ccp/exliquid-compose.yml index 2c97b83..95bcbea 100644 --- a/ccp/exliquid-compose.yml +++ b/ccp/exliquid-compose.yml @@ -17,21 +17,19 @@ services: image: "samply/report-hub:latest" container_name: bridgehead-report-hub environment: - BASE_URL: "http://bridgehead-report-hub:8080" + SPRING_WEBFLUX_BASE_PATH: "/ccp-report-hub" JAVA_TOOL_OPTIONS: "-Xmx1g" LOG_LEVEL: "debug" PROXY_ID: "report-hub.${PROXY_ID}" SECRET: ${REPORTHUB_BEAM_SECRET_SHORT} - TASK_STORE: "http://bridgehead-task-store:8080/fhir" - LDM_URL: http://bridgehead-ccp-blaze:8080/fhir + APP_TASKSTORE_BASEURL: "http://bridgehead-task-store:8080/fhir" + APP_DATASTORE_BASEURL: http://bridgehead-ccp-blaze:8080/fhir BEAM_PROXY: "http://beam-proxy:8081" restart: always labels: - "traefik.enable=true" - "traefik.http.routers.report-ccp.rule=PathPrefix(`/ccp-report-hub`)" - - "traefik.http.middlewares.ccp_t_strip.stripprefix.prefixes=/ccp-report-hub" - "traefik.http.services.report-ccp.loadbalancer.server.port=8080" - - "traefik.http.routers.report-ccp.middlewares=ccp_t_strip" - "traefik.http.routers.report-ccp.tls=true" volumes: diff --git a/ccp/exliquid-setup.sh b/ccp/exliquid-setup.sh index 59d8877..e1daa11 100644 --- a/ccp/exliquid-setup.sh +++ b/ccp/exliquid-setup.sh @@ -2,7 +2,7 @@ function exliquidSetup() { if [ -n "$EXLIQUID" ]; then - log INFO "EXLIQUID setup detected -- will start Reporthub." + log INFO "EXLIQUID setup detected -- will start Report-Hub." OVERRIDE+="-f ./$PROJECT/exliquid-compose.yml" fi } \ No newline at end of file