Fixed compose file for exliquid

This commit is contained in:
Patrick Skowronek 2022-12-05 13:18:14 +01:00
parent fc3198d22c
commit b061bf6350
2 changed files with 4 additions and 6 deletions

View File

@ -17,21 +17,19 @@ services:
image: "samply/report-hub:latest" image: "samply/report-hub:latest"
container_name: bridgehead-report-hub container_name: bridgehead-report-hub
environment: environment:
BASE_URL: "http://bridgehead-report-hub:8080" SPRING_WEBFLUX_BASE_PATH: "/ccp-report-hub"
JAVA_TOOL_OPTIONS: "-Xmx1g" JAVA_TOOL_OPTIONS: "-Xmx1g"
LOG_LEVEL: "debug" LOG_LEVEL: "debug"
PROXY_ID: "report-hub.${PROXY_ID}" PROXY_ID: "report-hub.${PROXY_ID}"
SECRET: ${REPORTHUB_BEAM_SECRET_SHORT} SECRET: ${REPORTHUB_BEAM_SECRET_SHORT}
TASK_STORE: "http://bridgehead-task-store:8080/fhir" APP_TASKSTORE_BASEURL: "http://bridgehead-task-store:8080/fhir"
LDM_URL: http://bridgehead-ccp-blaze:8080/fhir APP_DATASTORE_BASEURL: http://bridgehead-ccp-blaze:8080/fhir
BEAM_PROXY: "http://beam-proxy:8081" BEAM_PROXY: "http://beam-proxy:8081"
restart: always restart: always
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.report-ccp.rule=PathPrefix(`/ccp-report-hub`)" - "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.services.report-ccp.loadbalancer.server.port=8080"
- "traefik.http.routers.report-ccp.middlewares=ccp_t_strip"
- "traefik.http.routers.report-ccp.tls=true" - "traefik.http.routers.report-ccp.tls=true"
volumes: volumes:

View File

@ -2,7 +2,7 @@
function exliquidSetup() { function exliquidSetup() {
if [ -n "$EXLIQUID" ]; then 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" OVERRIDE+="-f ./$PROJECT/exliquid-compose.yml"
fi fi
} }