Skip to content

Commit 72beef0

Browse files
committed
chore: Switch to bitnami keycloak image and update config
1 parent 2dd2cbe commit 72beef0

File tree

4 files changed

+3236
-9
lines changed

4 files changed

+3236
-9
lines changed

compas/docker-compose-postgresql.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ services:
88
postgresql:
99
labels:
1010
compas: true
11+
platform: linux/amd64
1112
image: "postgres:16.2"
1213
ports:
1314
- "5432:5432"
@@ -33,10 +34,11 @@ services:
3334
ports:
3435
- "8089:8080"
3536
environment:
36-
- KEYCLOAK_FRONTEND_URL=http://${COMPAS_HOSTNAME}/auth/
3737
- KEYCLOAK_HOSTNAME=${COMPAS_HOSTNAME}
38-
- KEYCLOAK_HTTP_PORT=80
39-
- PROXY_ADDRESS_FORWARDING=true
38+
- KEYCLOAK_HTTP_RELATIVE_PATH=auth
39+
- KEYCLOAK_HTTP_PORT=8080
40+
volumes:
41+
- ./keycloak/realms:/opt/bitnami/keycloak/data/import
4042
healthcheck:
4143
test: ["CMD", "curl", "-f", "http://localhost:8080/auth/"]
4244
interval: 30s
@@ -46,6 +48,7 @@ services:
4648
scl-data-service:
4749
labels:
4850
compas: true
51+
platform: linux/amd64
4952
image: "lfenergy/compas-scl-data-service:0.15.0-postgresql"
5053
ports:
5154
- "9090:8080"
@@ -100,6 +103,7 @@ services:
100103
scl-auto-alignment:
101104
labels:
102105
compas: true
106+
platform: linux/amd64
103107
image: "lfenergy/compas-scl-auto-alignment:0.5.1"
104108
ports:
105109
- "9092:8080"
@@ -124,6 +128,7 @@ services:
124128
scl-validator:
125129
labels:
126130
compas: true
131+
platform: linux/amd64
127132
image: "lfenergy/compas-scl-validator:0.6.1"
128133
ports:
129134
- "9093:8080"
@@ -151,6 +156,7 @@ services:
151156
open-scd:
152157
labels:
153158
compas: true
159+
platform: linux/amd64
154160
image: "lfenergy/compas-open-scd:v0.33.0.7"
155161
depends_on:
156162
- scl-data-service

compas/keycloak/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
FROM jboss/keycloak:latest
5+
FROM bitnami/keycloak:latest
66

77
ARG COMPAS_HOSTNAME
88

99
# Copy the demo realm configuration to /tmp/ inside the container, so it can be used afterwards
10-
COPY --chown=jboss:jboss keycloak_compas_realm.json /tmp/keycloak_compas_realm.json
10+
COPY --chown=keycloak:keycloak keycloak_compas_realm.json /tmp/keycloak_compas_realm.json
1111
RUN sed -i "s/##COMPAS_HOSTNAME##/${COMPAS_HOSTNAME}/g" /tmp/keycloak_compas_realm.json
1212

1313
# Creating an Admin account
14-
ENV KEYCLOAK_USER admin
15-
ENV KEYCLOAK_PASSWORD admin
14+
ENV KEYCLOAK_ADMIN_USER admin
15+
ENV KEYCLOAK_ADMIN_PASSWORD admin
1616

1717
# Choosing h2 database
18-
ENV DB_VENDOR h2
18+
ENV KEYCLOAK_DATABASE_VENDOR "dev-file"
1919

2020
# Import the configuration we just copied
21-
ENV KEYCLOAK_IMPORT /tmp/keycloak_compas_realm.json
21+
ENV KEYCLOAK_EXTRA_ARGS "--import-realm"

0 commit comments

Comments
 (0)