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

Update Keycloak to 26.1.2 #225

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions common-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ services:
retries: 10
shogun-keycloak:
container_name: ${CONTAINER_NAME_PREFIX}-keycloak
image: quay.io/keycloak/keycloak:25.0.6
image: quay.io/keycloak/keycloak:26.1.2
environment:
KEYCLOAK_ADMIN: ${KEYCLOAK_USER}
KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_PASSWORD}
Expand All @@ -47,14 +47,15 @@ services:
KC_DB_USERNAME: ${POSTGRES_USER}
KC_DB_PASSWORD: ${POSTGRES_PASSWORD}
KC_HOSTNAME: ${KEYCLOAK_HOST}
KC_HOSTNAME_PATH: /auth
KC_HTTP_ENABLED: "true"
KC_HTTP_RELATIVE_PATH: /auth
KC_PROXY_HEADERS: "xforwarded"
depends_on:
shogun-postgis:
condition: service_healthy
# Enable if you want to disable caching of the theme templates, e.g. while adjusting the custom shogun one.
# command: ["start", "--proxy-headers", "xforwarded", "--http-enabled", "true", "--spi-theme-static-max-age=-1", "--spi-theme-cache-themes=false", "--spi-theme-cache-templates=false"]
command: ["start", "--proxy-headers", "xforwarded", "--http-enabled", "true"]
# command: ["start", "--spi-theme-static-max-age=-1", "--spi-theme-cache-themes=false", "--spi-theme-cache-templates=false"]
command: ["start"]
volumes:
- ./shogun-keycloak/keystore/cacerts:/etc/pki/ca-trust/extracted/java/cacerts
- ./shogun-keycloak/providers/event-listener-shogun-jar-with-dependencies.jar:/opt/keycloak/providers/event-listener-shogun-jar-with-dependencies.jar
Expand Down
7 changes: 7 additions & 0 deletions shogun-keycloak/themes/shogun/login/footer.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<#macro content>
<footer class="kc-footer-container">
<p>
&copy; 2021 - present <a href="https://www.terrestris.de">terrestris GmbH & Co. KG</a>
</p>
</footer>
</#macro>
69 changes: 69 additions & 0 deletions shogun-keycloak/themes/shogun/login/resources/css/login.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
.login-pf body {
background: white;
font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
}

#keycloak-bg {
display: flex;
flex-direction: column;
}

.header-container {
border-bottom: 1px solid #dee2e6;
display: flex;
justify-content: center;
padding-top: 0.5rem;
padding-bottom: 0.5rem;

.logo {
height: 50px;
}
}

.pf-v5-c-login {
min-height: unset;
/* height: 100%; */
}

.logo-container {
border-bottom: 1px solid #dee2e6;
display: flex;
justify-content: center;
/* padding-top: 0.5rem;*/
padding-bottom: 1.5rem;
margin-bottom: 1.5rem;

img {
height: 50px;
}
}

#kc-header {
margin-block-start: unset;

#kc-header-wrapper {
color: rgb(0, 0, 0) !important;
font-size: 2rem;
font-weight: 500;
text-transform: none;
}
}

.pf-m-primary {
background-color: #0b5ed7 !important;
}

.kc-footer-container {
border-top: 1px solid #dee2e6;
position: absolute;
background-color: white;
bottom: 0;
left: 0;
text-align: center;
width: 100%;
font-size: smaller;

p {
margin: 10px;
}
}
74 changes: 0 additions & 74 deletions shogun-keycloak/themes/shogun/login/resources/css/styles.css

This file was deleted.

68 changes: 68 additions & 0 deletions shogun-keycloak/themes/shogun/login/resources/img/shogun-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading