Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add env vars to support shl creator and server logging #47

Merged
merged 2 commits into from
Feb 1, 2025

Conversation

daniellrgn
Copy link
Contributor

No description provided.

@daniellrgn daniellrgn requested a review from ivan-c January 31, 2025 23:23
Copy link
Member

@ivan-c ivan-c left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

Couple nitpicks, but no blockers

@@ -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"}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The docker image tag won't provide much information on development servers, since they generally won't be tagged. You may want to use git describe output at build-time to populate this value.

Here's a PR the implements the CI, but you'll also need a way to consume that environment variable in the app code

uwcirg/asbi-screening-app#48

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Added that function to the builds here:
shl-creator: uwcirg/shl-ltt#27
shl-server: uwcirg/shl-ltt-server#3
and removed the use of the image tag in this change.

@@ -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"}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't need to be quoted, at least for YAML

Suggested change
VERSION: ${SHL_SERVER_IMAGE_TAG:-"latest"}
VERSION: ${SHL_SERVER_IMAGE_TAG:-latest}

@@ -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"}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't need to be quoted, at least for YAML

Suggested change
VITE_VERSION_STRING: ${SHL_CREATOR_IMAGE_TAG:-"latest"}
VITE_VERSION_STRING: ${SHL_CREATOR_IMAGE_TAG:-latest}

@daniellrgn daniellrgn merged commit 7c078e6 into main Feb 1, 2025
@daniellrgn daniellrgn deleted the add-shl-logging branch February 1, 2025 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants