From a839996788c0c3d8f5aa4e3b5d3f49228d239e5b Mon Sep 17 00:00:00 2001 From: "p.delpy@dkfz-heidelberg.de" Date: Wed, 4 Sep 2024 10:02:19 +0200 Subject: [PATCH] hotfix: add kr to projects --- bridgehead | 3 +++ kr/docker-compose.yml | 18 +++++++++--------- kr/modules/lens-compose.yml | 2 +- lib/functions.sh | 2 +- lib/prepare-system.sh | 3 +++ 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/bridgehead b/bridgehead index 6b446c4..d9917ec 100755 --- a/bridgehead +++ b/bridgehead @@ -38,6 +38,9 @@ case "$PROJECT" in itcc) #nothing extra to do ;; + kr) + #nothing extra to do + ;; minimal) #nothing extra to do ;; diff --git a/kr/docker-compose.yml b/kr/docker-compose.yml index 13c5f38..d875a24 100644 --- a/kr/docker-compose.yml +++ b/kr/docker-compose.yml @@ -3,9 +3,9 @@ version: "3.7" services: blaze: image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 - container_name: bridgehead-cce-blaze + container_name: bridgehead-kr-blaze environment: - BASE_URL: "http://bridgehead-cce-blaze:8080" + BASE_URL: "http://bridgehead-kr-blaze:8080" JAVA_TOOL_OPTIONS: "-Xmx${BLAZE_MEMORY_CAP:-4096}m" DB_RESOURCE_CACHE_SIZE: ${BLAZE_RESOURCE_CACHE_CAP:-2500000} DB_BLOCK_CACHE_SIZE: $BLAZE_MEMORY_CAP @@ -14,11 +14,11 @@ services: - "blaze-data:/app/data" labels: - "traefik.enable=true" - - "traefik.http.routers.blaze_cce.rule=PathPrefix(`/cce-localdatamanagement`)" - - "traefik.http.middlewares.cce_b_strip.stripprefix.prefixes=/cce-localdatamanagement" - - "traefik.http.services.blaze_cce.loadbalancer.server.port=8080" - - "traefik.http.routers.blaze_cce.middlewares=cce_b_strip,auth" - - "traefik.http.routers.blaze_cce.tls=true" + - "traefik.http.routers.blaze_kr.rule=PathPrefix(`/kr-localdatamanagement`)" + - "traefik.http.middlewares.kr_b_strip.stripprefix.prefixes=/kr-localdatamanagement" + - "traefik.http.services.blaze_kr.loadbalancer.server.port=8080" + - "traefik.http.routers.blaze_kr.middlewares=kr_b_strip,auth" + - "traefik.http.routers.blaze_kr.tls=true" focus: image: docker.verbis.dkfz.de/cache/samply/focus:${FOCUS_TAG} @@ -27,7 +27,7 @@ services: API_KEY: ${FOCUS_BEAM_SECRET_SHORT} BEAM_APP_ID_LONG: focus.${PROXY_ID} PROXY_ID: ${PROXY_ID} - BLAZE_URL: "http://bridgehead-cce-blaze:8080/fhir/" + BLAZE_URL: "http://bridgehead-kr-blaze:8080/fhir/" BEAM_PROXY_URL: http://beam-proxy:8081 RETRY_COUNT: ${FOCUS_RETRY_COUNT} EPSILON: 0.28 @@ -52,7 +52,7 @@ services: - "forward_proxy" volumes: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - - /srv/docker/bridgehead/cce/root.crt.pem:/conf/root.crt.pem:ro + - /srv/docker/bridgehead/kr/root.crt.pem:/conf/root.crt.pem:ro volumes: diff --git a/kr/modules/lens-compose.yml b/kr/modules/lens-compose.yml index 12b95ce..180dd67 100644 --- a/kr/modules/lens-compose.yml +++ b/kr/modules/lens-compose.yml @@ -17,7 +17,7 @@ services: BEAM_PROXY_ID: ${SITE_ID} BEAM_BROKER_ID: ${BROKER_ID} BEAM_APP_ID: "focus" - PROJECT_METADATA: "cce_supervisors" + PROJECT_METADATA: "kr_supervisors" depends_on: - "beam-proxy" labels: diff --git a/lib/functions.sh b/lib/functions.sh index dc5ec25..385dfa3 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -54,7 +54,7 @@ checkOwner(){ printUsage() { echo "Usage: bridgehead start|stop|logs|docker-logs|is-running|update|install|uninstall|adduser|enroll PROJECTNAME" - echo "PROJECTNAME should be one of ccp|bbmri|cce|itcc" + echo "PROJECTNAME should be one of ccp|bbmri|cce|itcc|kr" } checkRequirements() { diff --git a/lib/prepare-system.sh b/lib/prepare-system.sh index f93b6f0..00e5278 100755 --- a/lib/prepare-system.sh +++ b/lib/prepare-system.sh @@ -58,6 +58,9 @@ case "$PROJECT" in itcc) site_configuration_repository_middle="git.verbis.dkfz.de/itcc-sites/" ;; + kr) + site_configuration_repository_middle="git.verbis.dkfz.de/krebsregister-sites/" + ;; minimal) site_configuration_repository_middle="git.verbis.dkfz.de/minimal-bridgehead-configs/" ;;