From 768f3a2c49fd2946d45b6e0595c7f93bc9be197a Mon Sep 17 00:00:00 2001 From: Daniel Lorigan Date: Thu, 30 Jan 2025 12:32:30 -0800 Subject: [PATCH 1/2] Add env vars to support shl creator and server logging --- base/docker-compose.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/docker-compose.yaml b/base/docker-compose.yaml index ec78575..4566f35 100644 --- a/base/docker-compose.yaml +++ b/base/docker-compose.yaml @@ -197,6 +197,9 @@ services: VITE_OIDC_LOGOUT_ENDPOINT: https://keycloak.${BASE_DOMAIN}/realms/ltt/protocol/openid-connect/logout VITE_OIDC_CHECK_SESSION_IFRAME: https://keycloak.${BASE_DOMAIN}/realms/ltt/protocol/openid-connect/login-status-iframe.html VITE_POST_LOGOUT_REDIRECT_URI: https://${BASE_DOMAIN}/users + VITE_LOG_URL: https://shl-server.${BASE_DOMAIN}/api/log + VITE_SYSTEM_URL: https://shl-creator.${BASE_DOMAIN} + VITE_VERSION_STRING: ${SHL_CREATOR_IMAGE_TAG:-"latest"} labels: - traefik.enable=true - traefik.http.routers.shl-creator-${COMPOSE_PROJECT_NAME}.rule=Host(`shl-creator.${BASE_DOMAIN}`) @@ -209,6 +212,7 @@ services: image: ghcr.io/uwcirg/shl-ltt-server:${SHL_SERVER_IMAGE_TAG:-latest} environment: PUBLIC_URL: https://shl-server.${BASE_DOMAIN} + VERSION: ${SHL_SERVER_IMAGE_TAG:-"latest"} labels: - traefik.enable=true - traefik.http.routers.shl-server-${COMPOSE_PROJECT_NAME}.rule=Host(`shl-server.${BASE_DOMAIN}`) From b13f02b0644de6f3c13e01f6f45d7faf72b67fd8 Mon Sep 17 00:00:00 2001 From: Daniel Lorigan Date: Sat, 1 Feb 2025 00:27:02 -0800 Subject: [PATCH 2/2] Remove version vars in favor of build-time git vcs args shl-creator: https://github.com/uwcirg/shl-ltt/pull/27 shl-server: https://github.com/uwcirg/shl-ltt-server/pull/3 --- base/docker-compose.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/base/docker-compose.yaml b/base/docker-compose.yaml index 4566f35..aefe480 100644 --- a/base/docker-compose.yaml +++ b/base/docker-compose.yaml @@ -199,7 +199,6 @@ services: VITE_POST_LOGOUT_REDIRECT_URI: https://${BASE_DOMAIN}/users VITE_LOG_URL: https://shl-server.${BASE_DOMAIN}/api/log VITE_SYSTEM_URL: https://shl-creator.${BASE_DOMAIN} - VITE_VERSION_STRING: ${SHL_CREATOR_IMAGE_TAG:-"latest"} labels: - traefik.enable=true - traefik.http.routers.shl-creator-${COMPOSE_PROJECT_NAME}.rule=Host(`shl-creator.${BASE_DOMAIN}`) @@ -212,7 +211,6 @@ services: image: ghcr.io/uwcirg/shl-ltt-server:${SHL_SERVER_IMAGE_TAG:-latest} environment: PUBLIC_URL: https://shl-server.${BASE_DOMAIN} - VERSION: ${SHL_SERVER_IMAGE_TAG:-"latest"} labels: - traefik.enable=true - traefik.http.routers.shl-server-${COMPOSE_PROJECT_NAME}.rule=Host(`shl-server.${BASE_DOMAIN}`)