Skip to content

Commit 8784f2f

Browse files
authored
Merge pull request #225 from terrestris/update-keycloak
Update Keycloak to 26.1.2
2 parents 966a467 + f87c05d commit 8784f2f

File tree

7 files changed

+316
-183
lines changed

7 files changed

+316
-183
lines changed

common-services.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ services:
3636
retries: 10
3737
shogun-keycloak:
3838
container_name: ${CONTAINER_NAME_PREFIX}-keycloak
39-
image: quay.io/keycloak/keycloak:25.0.6
39+
image: quay.io/keycloak/keycloak:26.1.2
4040
environment:
4141
KEYCLOAK_ADMIN: ${KEYCLOAK_USER}
4242
KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_PASSWORD}
@@ -47,14 +47,15 @@ services:
4747
KC_DB_USERNAME: ${POSTGRES_USER}
4848
KC_DB_PASSWORD: ${POSTGRES_PASSWORD}
4949
KC_HOSTNAME: ${KEYCLOAK_HOST}
50-
KC_HOSTNAME_PATH: /auth
50+
KC_HTTP_ENABLED: "true"
5151
KC_HTTP_RELATIVE_PATH: /auth
52+
KC_PROXY_HEADERS: "xforwarded"
5253
depends_on:
5354
shogun-postgis:
5455
condition: service_healthy
5556
# Enable if you want to disable caching of the theme templates, e.g. while adjusting the custom shogun one.
56-
# command: ["start", "--proxy-headers", "xforwarded", "--http-enabled", "true", "--spi-theme-static-max-age=-1", "--spi-theme-cache-themes=false", "--spi-theme-cache-templates=false"]
57-
command: ["start", "--proxy-headers", "xforwarded", "--http-enabled", "true"]
57+
# command: ["start", "--spi-theme-static-max-age=-1", "--spi-theme-cache-themes=false", "--spi-theme-cache-templates=false"]
58+
command: ["start"]
5859
volumes:
5960
- ./shogun-keycloak/keystore/cacerts:/etc/pki/ca-trust/extracted/java/cacerts
6061
- ./shogun-keycloak/providers/event-listener-shogun-jar-with-dependencies.jar:/opt/keycloak/providers/event-listener-shogun-jar-with-dependencies.jar
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<#macro content>
2+
<footer class="kc-footer-container">
3+
<p>
4+
&copy; 2025 - present <a href="https://www.terrestris.de">terrestris GmbH & Co. KG</a>
5+
</p>
6+
</footer>
7+
</#macro>
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
.login-pf body {
2+
background: white;
3+
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";
4+
}
5+
6+
#keycloak-bg {
7+
display: flex;
8+
flex-direction: column;
9+
}
10+
11+
.header-container {
12+
border-bottom: 1px solid #dee2e6;
13+
display: flex;
14+
justify-content: center;
15+
padding-top: 0.5rem;
16+
padding-bottom: 0.5rem;
17+
18+
.logo {
19+
height: 50px;
20+
}
21+
}
22+
23+
.pf-v5-c-login {
24+
min-height: unset;
25+
flex: 1;
26+
}
27+
28+
.logo-container {
29+
border-bottom: 1px solid #dee2e6;
30+
display: flex;
31+
justify-content: center;
32+
padding-bottom: 1.5rem;
33+
margin-bottom: 1.5rem;
34+
35+
img {
36+
height: 50px;
37+
}
38+
}
39+
40+
#kc-header {
41+
margin-block-start: unset;
42+
43+
#kc-header-wrapper {
44+
color: rgb(0, 0, 0) !important;
45+
font-size: 2rem;
46+
font-weight: 500;
47+
text-transform: none;
48+
}
49+
}
50+
51+
.pf-m-primary {
52+
background-color: #0b5ed7 !important;
53+
}
54+
55+
.kc-footer-container {
56+
height: 40px;
57+
border-top: 1px solid #dee2e6;
58+
background-color: white;
59+
text-align: center;
60+
width: 100%;
61+
font-size: smaller;
62+
63+
p {
64+
margin: 10px;
65+
}
66+
}

shogun-keycloak/themes/shogun/login/resources/css/styles.css

Lines changed: 0 additions & 74 deletions
This file was deleted.
Lines changed: 68 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)