WIP blaze frontend

Merge pull request #185 from samply/update/focus_main
switch focus of ccp to tag
2025-06-16 15:00:15 +02:00 · 2024-05-28 14:14:36 +02:00 · 2024-05-21 16:21:22 +02:00 · 2024-05-21 16:16:40 +02:00 · 2024-04-29 08:33:00 +02:00 · 2024-04-26 11:29:38 +02:00
3 changed files with 24 additions and 1 deletions
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@ -19,9 +19,30 @@ services:
      - "traefik.http.services.blaze_ccp.loadbalancer.server.port=8080"
      - "traefik.http.routers.blaze_ccp.middlewares=ccp_b_strip,auth"
      - "traefik.http.routers.blaze_ccp.tls=true"
+    
+  frontend:
+    image: "samply/blaze-frontend:latest"
+    environment:
+      ORIGIN: "https://${HOST}/ccp-blaze-frontend"
+      BACKEND_BASE_URL: "https://${HOST}/ccp-localdatamanagement"
+      AUTH_CLIENT_ID: "${OIDC_PRIVATE_CLIENT_ID}"
+      AUTH_CLIENT_SECRET: "${OIDC_CLIENT_SECRET}"
+      AUTH_ISSUER: "${OIDC_URL}"
+      AUTH_SECRET: "666df42c74ce1f4728fe2ffe99b146e0f2e4b4f9810594fcf68c0330495bca0f" # TODO: Generate
+      PROTOCOL_HEADER: "x-forwarded-proto"
+      HOST_HEADER: "x-forwarded-host"
+    depends_on:
+      - blaze
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.blaze_frontend.rule=PathPrefix(`/ccp-blaze-frontend`)"
+      - "traefik.http.middlewares.ccp_blaze_frontend_strip.stripprefix.prefixes=/ccp-blaze-frontend"
+      - "traefik.http.routers.blaze_ccp.middlewares=ccp_blaze_frontend_strip"
+      - "traefik.http.services.blaze_frontend.loadbalancer.server.port=3000"
+      - "traefik.http.routers.blaze_frontend.tls=true"

  focus:
-    image: docker.verbis.dkfz.de/cache/samply/focus:0.4.4
+    image: docker.verbis.dkfz.de/cache/samply/focus:${FOCUS_TAG}
    container_name: bridgehead-focus
    environment:
      API_KEY: ${FOCUS_BEAM_SECRET_SHORT}
--- a/ccp/modules/id-management-compose.yml
+++ b/ccp/modules/id-management-compose.yml
@ -29,6 +29,7 @@ services:
    container_name: bridgehead-patientlist
    environment:
      - TOMCAT_REVERSEPROXY_FQDN=${HOST}
+      - TOMCAT_REVERSEPROXY_SSL=true
      - ML_SITE=${IDMANAGEMENT_FRIENDLY_ID}
      - ML_DB_PASS=${PATIENTLIST_POSTGRES_PASSWORD}
      - ML_API_KEY=${IDMANAGER_LOCAL_PATIENTLIST_APIKEY}
--- a/ccp/vars
+++ b/ccp/vars
@ -17,6 +17,7 @@ OIDC_REALM="${OIDC_REALM:-master}"
 OIDC_URL="https://login.verbis.dkfz.de"
 OIDC_ISSUER_URL="${OIDC_URL}/realms/${OIDC_REALM}"
 OIDC_GROUP_CLAIM="groups"
+add_private_oidc_redirect_url "/ccp-localdatamanagement"

 POSTGRES_TAG=15.6-alpine
Author	SHA1	Message	Date
janskiba	667048d49f	WIP blaze frontend	2024-05-28 14:14:36 +02:00
patrickskowronekdkfz	68f06c0d9d	Merge pull request #185 from samply/update/focus_main switch focus of ccp to tag	2024-05-21 16:21:22 +02:00
Patrick Skowronek	033da484d1	switch focus of ccp to tag	2024-05-21 16:16:40 +02:00
patrickskowronekdkfz	714e46f082	Merge pull request #184 from samply/refactor/mainzelliste-return-ssl Ensure Mainzelliste returns SSL in Responses	2024-04-29 08:33:00 +02:00
Torben Brenner	29c2b5ef69	refactor: Ensure Mainzelliste returns SSL in Responses Before, the Mainzelliste would always use http instead of https then referring to it self in responses	2024-04-26 11:29:38 +02:00
patrickskowronekdkfz	433edde75a	Merge pull request #182 from samply/revert-177-maintenance/gbn Revert "GBN maintenance mode"	2024-04-18 11:37:11 +02:00
patrickskowronekdkfz	fe3fc6204a	Revert "GBN maintenance mode"	2024-04-18 11:01:04 +02:00
patrickskowronekdkfz	4b3b13b101	Merge pull request #177 from samply/maintenance/gbn GBN maintenance mode	2024-04-17 20:47:35 +02:00
Patrick Skowronek	1afbf88a76	fix: use only bbmri broker	2024-04-16 09:23:42 +02:00
Patrick Skowronek	94b2c29bc7	GBN maintenance mode	2024-04-15 08:31:57 +02:00