From 06f38143b29c508282e87fbf0f61173ee5caf99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gr=C3=BCndner?= Date: Mon, 21 Oct 2024 01:42:33 +0200 Subject: [PATCH] bump versions of components, add triangle auth as extra host to portal, remove old mapping paths --- feasibility-portal/backend/docker-compose.yml | 8 ++++---- feasibility-portal/gui/docker-compose.yml | 2 +- feasibility-triangle/flare/docker-compose.yml | 2 +- feasibility-triangle/torch/docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/feasibility-portal/backend/docker-compose.yml b/feasibility-portal/backend/docker-compose.yml index f5c34ca..631cdcd 100644 --- a/feasibility-portal/backend/docker-compose.yml +++ b/feasibility-portal/backend/docker-compose.yml @@ -1,7 +1,7 @@ services: dataportal-backend: restart: unless-stopped - image: ghcr.io/medizininformatik-initiative/feasibility-backend:6.0.0-test.1 + image: ghcr.io/medizininformatik-initiative/feasibility-backend:6.0.0-alpha.3 ports: - ${DATAPORTAL_BACKEND_PORT:-127.0.0.1:8091}:8090 depends_on: @@ -30,8 +30,6 @@ services: # ---- ontology ONTOLOGY_FILES_FOLDER_UI: ${DATAPORTAL_BACKEND_ONTOLOGY_FILES_FOLDER:-/opt/dataportal-backend/ontology} ONTOLOGY_DB_MIGRATION_FOLDER: ${DATAPORTAL_BACKEND_ONTOLOGY_DB_MIGRATION_FOLDER:-/opt/dataportal-backend/ontology/migration} - MAPPINGS_FILE: ${DATAPORTAL_BACKEND_ONTOLOGY_FILES_FOLDER:-/opt/dataportal-backend/ontology}/codex-term-code-mapping.json - CONCEPT_TREE_FILE: ${DATAPORTAL_BACKEND_ONTOLOGY_FILES_FOLDER:-/opt/dataportal-backend/ontology}/codex-code-tree.json # ---- auth KEYCLOAK_ENABLED: ${DATAPORTAL_BACKEND_KEYCLOAK_ENABLED:-true} KEYCLOAK_BASE_URL: ${DATAPORTAL_BACKEND_KEYCLOAK_BASE_URL:-http://keycloak:8080} @@ -43,7 +41,7 @@ services: KEYCLOAK_BASE_URL_JWK: ${DATAPORTAL_BACKEND_KEYCLOAK_BASE_URL_JWK:-http://auth:8080} KEYCLOAK_REALM: ${DATAPORTAL_BACKEND_KEYCLOAK_REALM:-dataportal} #---- Mock broker - BROKER_CLIENT_MOCK_ENABLED: ${DATAPORTAL_BACKEND_BROKER_CLIENT_MOCK_ENABLED:-true} + BROKER_CLIENT_MOCK_ENABLED: ${DATAPORTAL_BACKEND_BROKER_CLIENT_MOCK_ENABLED:-false} #---- Direct broker BROKER_CLIENT_DIRECT_ENABLED: ${DATAPORTAL_BACKEND_BROKER_CLIENT_DIRECT_ENABLED:-false} BROKER_CLIENT_DIRECT_USE_CQL: ${DATAPORTAL_BACKEND_BROKER_CLIENT_DIRECT_USE_CQL:-false} @@ -90,6 +88,8 @@ services: # ---- logging LOG_LEVEL_SQL: ${DATAPORTAL_BACKEND_LOG_LEVEL_SQL:-warn} LOG_LEVEL: ${DATAPORTAL_BACKEND_LOG_LEVEL:-warn} + extra_hosts: + - "auth.localhost:host-gateway" volumes: - ${DATAPORTAL_BACKEND_CERTS_PATH:-../secrets}:/opt/dataportal-security - ./certs:/opt/dataportal-backend/certs diff --git a/feasibility-portal/gui/docker-compose.yml b/feasibility-portal/gui/docker-compose.yml index 6d630e6..73ad4fd 100644 --- a/feasibility-portal/gui/docker-compose.yml +++ b/feasibility-portal/gui/docker-compose.yml @@ -1,6 +1,6 @@ services: dataportal-ui: - image: ghcr.io/medizininformatik-initiative/feasibility-gui:6.0.0-test.4 + image: ghcr.io/medizininformatik-initiative/feasibility-gui:6.0.0-alpha.4 restart: unless-stopped volumes: - ./deploy-config.json:/usr/share/nginx/html/assets/config/config.deploy.json diff --git a/feasibility-triangle/flare/docker-compose.yml b/feasibility-triangle/flare/docker-compose.yml index f874107..cdfc31a 100644 --- a/feasibility-triangle/flare/docker-compose.yml +++ b/feasibility-triangle/flare/docker-compose.yml @@ -1,6 +1,6 @@ services: flare: - image: ghcr.io/medizininformatik-initiative/flare:2.3.0 + image: ghcr.io/medizininformatik-initiative/flare:2.4.0-alpha.2 ports: - ${FEASIBILITY_FLARE_PORT:-127.0.0.1:8084}:8080 environment: diff --git a/feasibility-triangle/torch/docker-compose.yml b/feasibility-triangle/torch/docker-compose.yml index f6dda5a..61eee20 100644 --- a/feasibility-triangle/torch/docker-compose.yml +++ b/feasibility-triangle/torch/docker-compose.yml @@ -9,7 +9,7 @@ services: - triangle-torch-data-store:/app/output torch: restart: unless-stopped - image: ghcr.io/medizininformatik-initiative/torch:develop + image: ghcr.io/medizininformatik-initiative/torch:1.0.0-alpha.1 ports: - ${TORCH_PORT:-127.0.0.1:8086}:8080 environment: