Compare commits

..

4 Commits

Author SHA1 Message Date
David Juarez
c01e383be8 test 2025-12-04 15:08:56 +01:00
David Juarez
fe81a5174c test 2025-12-03 12:55:09 +01:00
Enola Knezevic
dd3387c2f1 test version blaze (#364)
This is the one we need urgently
2025-12-01 12:54:57 +01:00
Enola Knezevic
a5120ba75b obfuscate BBMRI ERIC way, test blaze version (#363) 2025-12-01 12:50:07 +01:00
5 changed files with 8 additions and 12 deletions

View File

@@ -11,6 +11,7 @@ services:
BLAZE_URL: "http://blaze:8080/fhir/" BLAZE_URL: "http://blaze:8080/fhir/"
BEAM_PROXY_URL: http://beam-proxy-eric:8081 BEAM_PROXY_URL: http://beam-proxy-eric:8081
RETRY_COUNT: ${FOCUS_RETRY_COUNT} RETRY_COUNT: ${FOCUS_RETRY_COUNT}
OBFUSCATE_BBMRI_ERIC_WAY: "true"
depends_on: depends_on:
- "beam-proxy-eric" - "beam-proxy-eric"
- "blaze" - "blaze"

View File

@@ -22,7 +22,8 @@ services:
- "traefik.http.routers.blaze_ccp.tls=true" - "traefik.http.routers.blaze_ccp.tls=true"
focus: focus:
image: docker.verbis.dkfz.de/cache/samply/focus:${FOCUS_TAG} #image: docker.verbis.dkfz.de/cache/samply/focus:${FOCUS_TAG}
image: ghcr.io/samply/focus:fix-exporter-v2
container_name: bridgehead-focus container_name: bridgehead-focus
environment: environment:
- API_KEY=${FOCUS_BEAM_SECRET_SHORT} - API_KEY=${FOCUS_BEAM_SECRET_SHORT}

View File

@@ -2,14 +2,12 @@ version: "3.7"
services: services:
lens: lens:
container_name: lens-federated-search container_name: lens-federated-search
image: docker.verbis.dkfz.de/ccp/lens:pscc image: docker.verbis.dkfz.de/ccp/lens:${SITE_ID}
labels: labels:
- "traefik.http.services.lens.loadbalancer.server.port=3000" - "traefik.http.services.lens.loadbalancer.server.port=3000"
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.lens.rule=Host(`${HOST}`)" - "traefik.http.routers.lens.rule=Host(`${HOST}`)"
- "traefik.http.routers.lens.tls=true" - "traefik.http.routers.lens.tls=true"
environment:
PUBLIC_SPOT_URL: "https://${HOST}/prod"
spot: spot:
image: samply/rustyspot:latest image: samply/rustyspot:latest
@@ -39,8 +37,4 @@ services:
- "traefik.http.routers.spot.rule=Host(`${HOST}`) && PathPrefix(`/prod`)" - "traefik.http.routers.spot.rule=Host(`${HOST}`) && PathPrefix(`/prod`)"
- "traefik.http.middlewares.stripprefix_spot.stripprefix.prefixes=/prod" - "traefik.http.middlewares.stripprefix_spot.stripprefix.prefixes=/prod"
- "traefik.http.routers.spot.tls=true" - "traefik.http.routers.spot.tls=true"
- "traefik.http.routers.spot.middlewares=corsheaders2,stripprefix_spot,auth" - "traefik.http.routers.spot.middlewares=corsheaders2,stripprefix_spot,auth"
beam-proxy:
environment:
APP_spot_KEY: ${FOCUS_BEAM_SECRET_SHORT}

View File

@@ -1,6 +1,6 @@
FOCUS_TAG=develop FOCUS_TAG=develop
BEAM_TAG=develop BEAM_TAG=develop
BLAZE_TAG=main BLAZE_TAG=0.32
POSTGRES_TAG=15.13-alpine POSTGRES_TAG=15.13-alpine
TEILER_DASHBOARD_TAG=develop TEILER_DASHBOARD_TAG=develop
MTBA_TAG=develop MTBA_TAG=develop

View File

@@ -1,6 +1,6 @@
FOCUS_TAG=develop FOCUS_TAG=develop
BEAM_TAG=develop BEAM_TAG=develop
BLAZE_TAG=main BLAZE_TAG=0.32
POSTGRES_TAG=15.13-alpine POSTGRES_TAG=15.13-alpine
TEILER_DASHBOARD_TAG=develop TEILER_DASHBOARD_TAG=develop
MTBA_TAG=develop MTBA_TAG=develop