From c6a807d717ed5bcd50c50e0f481a9b56a8fef6d8 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Mon, 31 Oct 2022 08:26:25 +0100 Subject: [PATCH 1/6] Added Report Hub for EXLIQUID --- ccp/exliquid-compose.yml | 38 ++++++++++++++++++++++++++++++++++++++ ccp/exliquid-setup.sh | 8 ++++++++ ccp/vars | 2 ++ 3 files changed, 48 insertions(+) create mode 100644 ccp/exliquid-compose.yml create mode 100644 ccp/exliquid-setup.sh diff --git a/ccp/exliquid-compose.yml b/ccp/exliquid-compose.yml new file mode 100644 index 0000000..0967ead --- /dev/null +++ b/ccp/exliquid-compose.yml @@ -0,0 +1,38 @@ +version: "3.7" + +services: + task-store: + image: "samply/blaze:0.18" + container_name: bridgehead-task-store + environment: + BASE_URL: "http://localhost:8083" + JAVA_TOOL_OPTIONS: "-Xmx1g" + LOG_LEVEL: "debug" + volumes: + - "task-store-data:/app/data" + labels: + - "traefik.enable=false" + + report-hub: + image: "samply/report-hub:latest" + container_name: bridgehead-report-hub + environment: + BASE_URL: "http://ccp-task-store:8080" + 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 + BEAM_PROXY: "http://beam-proxy:8081" + restart: always + labels: + - "traefik.enable=true" + - "traefik.http.routers.blaze_ccp.rule=PathPrefix(`/ccp-report-hub`)" + - "traefik.http.middlewares.ccp_t_strip.stripprefix.prefixes=/ccp-report-hub" + - "traefik.http.services.blaze_ccp.loadbalancer.server.port=8080" + - "traefik.http.routers.blaze_ccp.middlewares=ccp_t_strip,ccp-auth" + - "traefik.http.routers.blaze_ccp.tls=true" + +volumes: + task-store-data: \ No newline at end of file diff --git a/ccp/exliquid-setup.sh b/ccp/exliquid-setup.sh new file mode 100644 index 0000000..59d8877 --- /dev/null +++ b/ccp/exliquid-setup.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +function exliquidSetup() { + if [ -n "$EXLIQUID" ]; then + log INFO "EXLIQUID setup detected -- will start Reporthub." + OVERRIDE+="-f ./$PROJECT/exliquid-compose.yml" + fi +} \ No newline at end of file diff --git a/ccp/vars b/ccp/vars index f5f734e..63def80 100644 --- a/ccp/vars +++ b/ccp/vars @@ -11,3 +11,5 @@ PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem # This will load nngm setup. Effective only if nngm configuration is defined. source $PROJECT/nngm-setup.sh nngmSetup +source $PROJECT/exliquid-setup.sh +exliquidSetup From 3f5463318d9c4d0920223f22ef1c9ac1f343eac7 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Mon, 31 Oct 2022 11:26:00 +0100 Subject: [PATCH 2/6] Fixed labels --- ccp/exliquid-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ccp/exliquid-compose.yml b/ccp/exliquid-compose.yml index 0967ead..60aeb1b 100644 --- a/ccp/exliquid-compose.yml +++ b/ccp/exliquid-compose.yml @@ -28,11 +28,11 @@ services: restart: always labels: - "traefik.enable=true" - - "traefik.http.routers.blaze_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.blaze_ccp.loadbalancer.server.port=8080" - - "traefik.http.routers.blaze_ccp.middlewares=ccp_t_strip,ccp-auth" - - "traefik.http.routers.blaze_ccp.tls=true" + - "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: task-store-data: \ No newline at end of file From fc3198d22c848d1d381ad8eeda9aabe0a4ee2873 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Mon, 31 Oct 2022 15:30:32 +0100 Subject: [PATCH 3/6] Fixed task store base url --- ccp/exliquid-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ccp/exliquid-compose.yml b/ccp/exliquid-compose.yml index 60aeb1b..2c97b83 100644 --- a/ccp/exliquid-compose.yml +++ b/ccp/exliquid-compose.yml @@ -5,7 +5,7 @@ services: image: "samply/blaze:0.18" container_name: bridgehead-task-store environment: - BASE_URL: "http://localhost:8083" + BASE_URL: "http://bridgehead-task-store:8080" JAVA_TOOL_OPTIONS: "-Xmx1g" LOG_LEVEL: "debug" volumes: @@ -17,7 +17,7 @@ services: image: "samply/report-hub:latest" container_name: bridgehead-report-hub environment: - BASE_URL: "http://ccp-task-store:8080" + BASE_URL: "http://bridgehead-report-hub:8080" JAVA_TOOL_OPTIONS: "-Xmx1g" LOG_LEVEL: "debug" PROXY_ID: "report-hub.${PROXY_ID}" From b061bf635039803736066367c154aad8be6c862e Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Mon, 5 Dec 2022 13:18:14 +0100 Subject: [PATCH 4/6] 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 From ece0dec9c9c044b64f77ccf9801d17dc10644007 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Tue, 6 Dec 2022 11:33:45 +0100 Subject: [PATCH 5/6] Rename exliquid docker containers --- ccp/exliquid-compose.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/ccp/exliquid-compose.yml b/ccp/exliquid-compose.yml index 95bcbea..9f05977 100644 --- a/ccp/exliquid-compose.yml +++ b/ccp/exliquid-compose.yml @@ -1,36 +1,34 @@ version: "3.7" services: - task-store: + exliquid-task-store: image: "samply/blaze:0.18" - container_name: bridgehead-task-store + container_name: bridgehead-exliquid-task-store environment: - BASE_URL: "http://bridgehead-task-store:8080" + BASE_URL: "http://bridgehead-exliquid-task-store:8080" JAVA_TOOL_OPTIONS: "-Xmx1g" - LOG_LEVEL: "debug" volumes: - - "task-store-data:/app/data" + - "exliquid-task-store-data:/app/data" labels: - "traefik.enable=false" - report-hub: + exliquid-report-hub: image: "samply/report-hub:latest" - container_name: bridgehead-report-hub + container_name: bridgehead-exliquid-report-hub environment: - SPRING_WEBFLUX_BASE_PATH: "/ccp-report-hub" + SPRING_WEBFLUX_BASE_PATH: "/exliquid" JAVA_TOOL_OPTIONS: "-Xmx1g" - LOG_LEVEL: "debug" PROXY_ID: "report-hub.${PROXY_ID}" SECRET: ${REPORTHUB_BEAM_SECRET_SHORT} - APP_TASKSTORE_BASEURL: "http://bridgehead-task-store:8080/fhir" + APP_TASKSTORE_BASEURL: "http://bridgehead-exliquid-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.routers.report-ccp.rule=PathPrefix(`/exliquid`)" - "traefik.http.services.report-ccp.loadbalancer.server.port=8080" - "traefik.http.routers.report-ccp.tls=true" volumes: - task-store-data: \ No newline at end of file + exliquid-task-store-data: \ No newline at end of file From af54f0ca04ef8efad53fc72975f7599e8fb615d8 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Tue, 6 Dec 2022 11:42:18 +0100 Subject: [PATCH 6/6] Define exliquid sites right inside the common bridgehead scripts --- ccp/exliquid-setup.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ccp/exliquid-setup.sh b/ccp/exliquid-setup.sh index e1daa11..8102fcb 100644 --- a/ccp/exliquid-setup.sh +++ b/ccp/exliquid-setup.sh @@ -1,7 +1,18 @@ #!/bin/bash function exliquidSetup() { - if [ -n "$EXLIQUID" ]; then + case ${SITE_ID} in + berlin|dresden|essen|frankfurt|freiburg|luebeck|mainz|muenchen-lmu|muenchen-tu|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