samply/bridgehead
1
0
Fork 0
mirror of https://github.com/samply/bridgehead.git synced 2025-06-16 15:00:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

exporter, reporter, teiler, auth for them

Browse Source
This commit is contained in:
enola DKFZ
2025-05-23 16:16:22 +02:00
committed by David Juarez
parent 8652b7c7ea
commit a765f6619f
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bbmri/modules/eric-compose.yml
View File

@ -26,6 +26,7 @@ services:
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
RUST_LOG: debug
secrets: secrets:
- proxy.pem - proxy.pem
depends_on: depends_on:

24
ccp/modules/exporter-compose.yml
View File

@ -18,11 +18,22 @@ services:
OPAL_PASSWORD: "${EXPORTER_OPAL_PASSWORD}" OPAL_PASSWORD: "${EXPORTER_OPAL_PASSWORD}"
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.exporter_${PLATFORM}.rule=PathPrefix(`/${PLATFORM}-exporter`)" - "traefik.http.routers.exporter_${PLATFORM}.rule=Path(`/${PLATFORM}-exporter/`)"
- "traefik.http.services.exporter_${PLATFORM}.loadbalancer.server.port=8092" - "traefik.http.services.exporter_${PLATFORM}.loadbalancer.server.port=8092"
- "traefik.http.routers.exporter_${PLATFORM}.tls=true" - "traefik.http.routers.exporter_${PLATFORM}.tls=true"
- "traefik.http.middlewares.exporter_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-exporter" - "traefik.http.middlewares.exporter_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-exporter"
- "traefik.http.middlewares.exporter_auth.basicauth.users=${EXPORTER_USER}"
#- "traefik.http.routers.exporter_${PLATFORM}.middlewares=exporter_${PLATFORM}_strip,exporter_auth"
- "traefik.http.routers.exporter_${PLATFORM}.middlewares=exporter_${PLATFORM}_strip" - "traefik.http.routers.exporter_${PLATFORM}.middlewares=exporter_${PLATFORM}_strip"
- "traefik.http.routers.exporter_${PLATFORM}.priority=20"
- "traefik.http.routers.exporter_${PLATFORM}_api.rule=PathRegexp(`/${PLATFORM}-exporter/.+`)"
- "traefik.http.routers.exporter_${PLATFORM}_api.tls=true"
#- "traefik.http.middlewares.exporter_${PLATFORM}_api_strip.stripprefix.prefixes=/${PLATFORM}-exporter"
#- "traefik.http.middlewares.exporter_api_auth.basicauth.users=${EXPORTER_USER}"
- "traefik.http.routers.exporter_${PLATFORM}_api.middlewares=exporter_${PLATFORM}_strip,exporter_auth"
#- "traefik.http.routers.exporter_${PLATFORM}_api.middlewares=exporter_auth"
- "traefik.http.routers.exporter_${PLATFORM}_api.priority=25"
volumes: volumes:
- "/var/cache/bridgehead/${PLATFORM}/exporter-files:/app/exporter-files/output" - "/var/cache/bridgehead/${PLATFORM}/exporter-files:/app/exporter-files/output"
@ -60,8 +71,15 @@ services:
- "/var/cache/bridgehead/${PLATFORM}/reporter-files:/app/reports" - "/var/cache/bridgehead/${PLATFORM}/reporter-files:/app/reports"
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.reporter_${PLATFORM}.rule=PathPrefix(`/${PLATFORM}-reporter`)" - "traefik.http.routers.reporter_${PLATFORM}.rule=Path(`/${PLATFORM}-reporter`)"
- "traefik.http.services.reporter_${PLATFORM}.loadbalancer.server.port=8095" - "traefik.http.services.reporter_${PLATFORM}.loadbalancer.server.port=8095"
- "traefik.http.routers.reporter_${PLATFORM}.tls=true" - "traefik.http.routers.reporter_${PLATFORM}.tls=true"
- "traefik.http.routers.reporter_${PLATFORM}.priority=20"
- "traefik.http.middlewares.reporter_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-reporter" - "traefik.http.middlewares.reporter_${PLATFORM}_strip.stripprefix.prefixes=/${PLATFORM}-reporter"
- "traefik.http.routers.reporter_${PLATFORM}.middlewares=reporter_${PLATFORM}_strip" #- "traefik.http.middlewares.reporter_auth.basicauth.users=${EXPORTER_USER}"
- "traefik.http.routers.reporter_${PLATFORM}.middlewares=reporter_${PLATFORM}_strip,exporter_auth"
- "traefik.http.routers.reporter_${PLATFORM}_api.rule=PathRegexp(`/${PLATFORM}-reporter/.+`)"
- "traefik.http.routers.reporter_${PLATFORM}_api.tls=true"
- "traefik.http.routers.reporter_${PLATFORM}_api.middlewares=reporter_${PLATFORM}_strip,exporter_auth"
- "traefik.http.routers.reporter_${PLATFORM}_api.priority=25"

3
ccp/modules/teiler-compose.yml
View File

@ -51,7 +51,8 @@ services:
teiler-backend: teiler-backend:
image: docker.verbis.dkfz.de/ccp/${PROJECT}-teiler-backend:latest #image: docker.verbis.dkfz.de/ccp/${PROJECT}-teiler-backend:latest
image: ttl.sh/bbmri-teiler-backend:5h
container_name: bridgehead-teiler-backend container_name: bridgehead-teiler-backend
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"

3
lib/prerequisites.sh
View File

@ -69,7 +69,8 @@ log INFO "Checking network access ($BROKER_URL_FOR_PREREQ) ..."
source "${CONFIG_DIR}${PROJECT}".conf source "${CONFIG_DIR}${PROJECT}".conf
source ${PROJECT}/vars source ${PROJECT}/vars
if [ "${PROJECT}" != "minimal" ]; then #if [ "${PROJECT}" != "minimal" ]; then
if false; then
set +e set +e
SERVERTIME="$(https_proxy=$HTTPS_PROXY_FULL_URL curl -m 5 -s -I $BROKER_URL_FOR_PREREQ 2>&1 | grep -i -e '^Date: ' | sed -e 's/^Date: //i')" SERVERTIME="$(https_proxy=$HTTPS_PROXY_FULL_URL curl -m 5 -s -I $BROKER_URL_FOR_PREREQ 2>&1 | grep -i -e '^Date: ' | sed -e 's/^Date: //i')"
RET=$? RET=$?

2
minimal/docker-compose.yml
View File

@ -10,7 +10,7 @@ services:
- --providers.docker=true - --providers.docker=true
- --providers.docker.exposedbydefault=false - --providers.docker.exposedbydefault=false
- --providers.file.directory=/configuration/ - --providers.file.directory=/configuration/
- --api.dashboard=false - --api.dashboard=true
- --accesslog=true - --accesslog=true
- --entrypoints.web.http.redirections.entrypoint.to=websecure - --entrypoints.web.http.redirections.entrypoint.to=websecure
- --entrypoints.web.http.redirections.entrypoint.scheme=https - --entrypoints.web.http.redirections.entrypoint.scheme=https