From fb6af1c4af3b7db363899fe13e6645598142596c Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Fri, 15 Dec 2023 09:43:31 +0000 Subject: [PATCH 1/2] Add nngm module to minimal project --- minimal/modules/nngm-compose.yml | 29 +++++++++++++++++++++++++++++ minimal/modules/nngm-setup.sh | 8 ++++++++ 2 files changed, 37 insertions(+) create mode 100644 minimal/modules/nngm-compose.yml create mode 100644 minimal/modules/nngm-setup.sh diff --git a/minimal/modules/nngm-compose.yml b/minimal/modules/nngm-compose.yml new file mode 100644 index 0000000..e61532d --- /dev/null +++ b/minimal/modules/nngm-compose.yml @@ -0,0 +1,29 @@ +version: "3.7" +volumes: + nngm-rest: + +services: + connector: + container_name: bridgehead-connector + image: docker.verbis.dkfz.de/ccp/nngm-rest:main + environment: + CTS_MAGICPL_API_KEY: ${NNGM_MAGICPL_APIKEY} + CTS_API_KEY: ${NNGM_CTS_APIKEY} + CRYPT_KEY: ${NNGM_CRYPTKEY} + #CTS_MAGICPL_SITE: ${SITE_ID}TODO + restart: always + labels: + - "traefik.enable=true" + - "traefik.http.routers.connector.rule=PathPrefix(`/nngm-connector`)" + - "traefik.http.middlewares.connector_strip.stripprefix.prefixes=/nngm-connector" + - "traefik.http.services.connector.loadbalancer.server.port=8080" + - "traefik.http.routers.connector.tls=true" + - "traefik.http.routers.connector.middlewares=connector_strip,auth-nngm" + volumes: + - nngm-rest:/var/log + + traefik: + labels: + - "traefik.http.middlewares.auth-nngm.basicauth.users=${NNGM_AUTH}" + + diff --git a/minimal/modules/nngm-setup.sh b/minimal/modules/nngm-setup.sh new file mode 100644 index 0000000..3e31f59 --- /dev/null +++ b/minimal/modules/nngm-setup.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +function nngmSetup() { + if [ -n "$NNGM_CTS_APIKEY" ]; then + log INFO "nNGM setup detected -- will start nNGM Connector." + OVERRIDE+=" -f ./$PROJECT/modules/nngm-compose.yml" + fi + } From 842c83c66f8c1532fc939933a83a85a6ace223d0 Mon Sep 17 00:00:00 2001 From: Tobias Kussel Date: Fri, 15 Dec 2023 10:39:50 +0000 Subject: [PATCH 2/2] Use updated nngm module setup --- minimal/modules/nngm-setup.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/minimal/modules/nngm-setup.sh b/minimal/modules/nngm-setup.sh index 3e31f59..56be949 100644 --- a/minimal/modules/nngm-setup.sh +++ b/minimal/modules/nngm-setup.sh @@ -1,8 +1,6 @@ #!/bin/bash -function nngmSetup() { - if [ -n "$NNGM_CTS_APIKEY" ]; then - log INFO "nNGM setup detected -- will start nNGM Connector." - OVERRIDE+=" -f ./$PROJECT/modules/nngm-compose.yml" - fi - } +if [ -n "$NNGM_CTS_APIKEY" ]; then + log INFO "nNGM setup detected -- will start nNGM Connector." + OVERRIDE+=" -f ./$PROJECT/modules/nngm-compose.yml" +fi