sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to non-legacy keycloak images

Browse Source 
This switches the keycloak service to the more recent quarkus based images. Away
from the legacy wildfly based image.
This commit is contained in:
Ralf Haferkamp
2023-01-31 09:17:29 +01:00
parent 237d566662
commit fdb42af20b
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployments/examples/ocis_keycloak/config/keycloak/docker-entrypoint-override.sh
+3 -3
View File
@@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
printenv printenv
# replace oCIS domain in keycloak realm import # replace oCIS domain in keycloak realm import
cp /opt/jboss/keycloak/ocis-realm.dist.json /opt/jboss/keycloak/ocis-realm.json mkdir /opt/keycloak/data/import
sed -i "s/ocis.owncloud.test/${OCIS_DOMAIN}/g" /opt/jboss/keycloak/ocis-realm.json sed -e "s/ocis.owncloud.test/${OCIS_DOMAIN}/g" /opt/keycloak/data/import-dist/ocis-realm.json > /opt/keycloak/data/import/ocis-realm.json
# run original docker-entrypoint # run original docker-entrypoint
/opt/jboss/tools/docker-entrypoint.sh /opt/keycloak/bin/kc.sh "$@"
deployments/examples/ocis_keycloak/docker-compose.yml
+14 -16
View File
@@ -60,7 +60,7 @@ services:
environment: environment:
# Keycloak IDP specific configuration # Keycloak IDP specific configuration
PROXY_AUTOPROVISION_ACCOUNTS: "true" PROXY_AUTOPROVISION_ACCOUNTS: "true"
OCIS_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-oCIS} OCIS_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/realms/${KEYCLOAK_REALM:-oCIS}
PROXY_OIDC_REWRITE_WELLKNOWN: "true" PROXY_OIDC_REWRITE_WELLKNOWN: "true"
WEB_OIDC_CLIENT_ID: ${OCIS_OIDC_CLIENT_ID:-web} WEB_OIDC_CLIENT_ID: ${OCIS_OIDC_CLIENT_ID:-web}
# general config # general config
@@ -99,26 +99,24 @@ services:
restart: always restart: always
keycloak: keycloak:
# Keycloak WildFly distribution, Quarkus is not ready yet for automatic setup https://github.com/keycloak/keycloak/issues/10216 image: quay.io/keycloak/keycloak:20.0
image: quay.io/keycloak/keycloak:legacy
networks: networks:
ocis-net: ocis-net:
entrypoint: ["/bin/sh", "/opt/jboss/tools/docker-entrypoint-override.sh"] command: ["start", "--proxy edge", "--import-realm"]
entrypoint: ["/bin/sh", "/opt/keycloak/bin/docker-entrypoint-override.sh"]
volumes: volumes:
- ./config/keycloak/docker-entrypoint-override.sh:/opt/jboss/tools/docker-entrypoint-override.sh - "./config/keycloak/docker-entrypoint-override.sh:/opt/keycloak/bin/docker-entrypoint-override.sh"
- ./config/keycloak/ocis-realm.dist.json:/opt/jboss/keycloak/ocis-realm.dist.json - "./config/keycloak/ocis-realm.dist.json:/opt/keycloak/data/import-dist/ocis-realm.json"
environment: environment:
OCIS_DOMAIN: ${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_DOMAIN: ${OCIS_DOMAIN:-ocis.owncloud.test}
DB_VENDOR: POSTGRES KC_HOSTNAME: ${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}
DB_ADDR: postgres KC_DB: postgres
DB_DATABASE: keycloak KC_DB_URL: "jdbc:postgresql://postgres:5432/keycloak"
DB_USER: keycloak KC_DB_USERNAME: keycloak
DB_SCHEMA: public KC_DB_PASSWORD: keycloak
DB_PASSWORD: keycloak KC_FEATURES: impersonation
KEYCLOAK_USER: ${KEYCLOAK_ADMIN_USER:-admin} KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN_USER:-admin}
KEYCLOAK_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-admin} KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-admin}
PROXY_ADDRESS_FORWARDING: "true"
KEYCLOAK_IMPORT: /opt/jboss/keycloak/ocis-realm.json
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.keycloak.entrypoints=https" - "traefik.http.routers.keycloak.entrypoints=https"