Beam suppressed

Changes have been made so that the Bridgehead can run without Beam.

ccp/docker-compose.yml

@@ -20,39 +20,39 @@ services:
       - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,auth"
       - "traefik.http.routers.blaze_ccp.tls=true"
 
-  focus:
+#  focus:
-    image: docker.verbis.dkfz.de/cache/samply/focus:0.4.4
+#    image: docker.verbis.dkfz.de/cache/samply/focus:0.4.4
-    container_name: bridgehead-focus
+#    container_name: bridgehead-focus
-    environment:
+#    environment:
-      API_KEY: ${FOCUS_BEAM_SECRET_SHORT}
+#      API_KEY: ${FOCUS_BEAM_SECRET_SHORT}
-      BEAM_APP_ID_LONG: focus.${PROXY_ID}
+#      BEAM_APP_ID_LONG: focus.${PROXY_ID}
-      PROXY_ID: ${PROXY_ID}
+#      PROXY_ID: ${PROXY_ID}
-      BLAZE_URL: "http://bridgehead-ccp-blaze:8080/fhir/"
+#      BLAZE_URL: "http://bridgehead-ccp-blaze:8080/fhir/"
-      BEAM_PROXY_URL: http://beam-proxy:8081
+#      BEAM_PROXY_URL: http://beam-proxy:8081
-      RETRY_COUNT: ${FOCUS_RETRY_COUNT}
+#      RETRY_COUNT: ${FOCUS_RETRY_COUNT}
-      EPSILON: 0.28
+#      EPSILON: 0.28
-    depends_on:
+#    depends_on:
-      - "beam-proxy"
+##      - "beam-proxy"
-      - "blaze"
+#      - "blaze"
 
-  beam-proxy:
+#  beam-proxy:
-    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
+#    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
-    container_name: bridgehead-beam-proxy
+#    container_name: bridgehead-beam-proxy
-    environment:
+#    environment:
-      BROKER_URL: ${BROKER_URL}
+#      BROKER_URL: ${BROKER_URL}
-      PROXY_ID: ${PROXY_ID}
+#      PROXY_ID: ${PROXY_ID}
-      APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT}
+#      APP_focus_KEY: ${FOCUS_BEAM_SECRET_SHORT}
-      PRIVKEY_FILE: /run/secrets/proxy.pem
+#      PRIVKEY_FILE: /run/secrets/proxy.pem
-      ALL_PROXY: http://forward_proxy:3128
+#      ALL_PROXY: http://forward_proxy:3128
-      TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
+#      TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
-      ROOTCERT_FILE: /conf/root.crt.pem
+#      ROOTCERT_FILE: /conf/root.crt.pem
-    secrets:
+#    secrets:
-      - proxy.pem
+#      - proxy.pem
-    depends_on:
+#    depends_on:
-      - "forward_proxy"
+#      - "forward_proxy"
-    volumes:
+#    volumes:
-      - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
+#      - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
-      - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro
+#      - /srv/docker/bridgehead/ccp/root.crt.pem:/conf/root.crt.pem:ro
 
 
 volumes:

ccp/modules/teiler-compose.yml

@@ -47,6 +47,10 @@ services:
       TEILER_ADMIN: "${OIDC_ADMIN_GROUP}"
       REPORTER_DEFAULT_TEMPLATE_ID: "ccp-qb"
       EXPORTER_DEFAULT_TEMPLATE_ID: "ccp"
+      APPLICATION_PORT: "8080"
+      CONFIG_ENV_VAR_PATH: "/run/secrets/ccp.conf"
+    secrets:
+      - ccp.conf
 
 
   teiler-backend:

lib/functions.sh

@@ -308,7 +308,7 @@ function sync_secrets() {
         BROKER_ROOT_CERT=/srv/docker/bridgehead/bbmri/$GBN_ROOT_CERT.crt.pem
         PROXY_ID=$GBN_PROXY_ID
         BROKER_ID=$GBN_BROKER_ID
-    elif [ "${PROJECT}" == "ccp"]; then
+    elif [ "${PROJECT}" == "ccp" ]; then
         BROKER_ROOT_CERT=/srv/docker/bridgehead/ccp/root.crt.pem
     else
         fail_and_report 1 "Could not start secret sync as the configuration does not seem to use beam"
@@ -316,19 +316,19 @@ function sync_secrets() {
     local broker_url="https://$BROKER_ID"
     mkdir -p /var/cache/bridgehead/secrets/ || fail_and_report 1 "Failed to create '/var/cache/bridgehead/secrets/'. Please run sudo './bridgehead install $PROJECT' again."
     touch /var/cache/bridgehead/secrets/oidc
-    docker run --rm \
+#    docker run --rm \
-        -v /var/cache/bridgehead/secrets/oidc:/usr/local/cache \
+#        -v /var/cache/bridgehead/secrets/oidc:/usr/local/cache \
-        -v $PRIVATEKEYFILENAME:/run/secrets/privkey.pem:ro \
+#        -v $PRIVATEKEYFILENAME:/run/secrets/privkey.pem:ro \
-        -v $BROKER_ROOT_CERT:/run/secrets/root.crt.pem:ro \
+#        -v $BROKER_ROOT_CERT:/run/secrets/root.crt.pem:ro \
-        -v /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro \
+#        -v /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro \
-        -e TLS_CA_CERTIFICATES_DIR=/conf/trusted-ca-certs \
+#        -e TLS_CA_CERTIFICATES_DIR=/conf/trusted-ca-certs \
-        -e NO_PROXY=localhost,127.0.0.1 \
+#        -e NO_PROXY=localhost,127.0.0.1 \
-        -e ALL_PROXY=$HTTPS_PROXY_FULL_URL \
+#        -e ALL_PROXY=$HTTPS_PROXY_FULL_URL \
-        -e PROXY_ID=$PROXY_ID \
+#        -e PROXY_ID=$PROXY_ID \
-        -e BROKER_URL=$broker_url \
+#        -e BROKER_URL=$broker_url \
-        -e OIDC_PROVIDER=secret-sync-central.oidc-client-enrollment.$BROKER_ID \
+#        -e OIDC_PROVIDER=secret-sync-central.oidc-client-enrollment.$BROKER_ID \
-        -e SECRET_DEFINITIONS=$secret_sync_args \
+#        -e SECRET_DEFINITIONS=$secret_sync_args \
-        docker.verbis.dkfz.de/cache/samply/secret-sync-local:latest
+#        docker.verbis.dkfz.de/cache/samply/secret-sync-local:latest
 
     set -a # Export variables as environment variables
     source /var/cache/bridgehead/secrets/*