Merge pull request 'Pull request from main' (#1) from coop-cloud/keycloak:master into master

Reviewed-on: #1

compose.yml

@@ -3,7 +3,9 @@ version: "3.8"
 
 services:
   app:
-    image: "jboss/keycloak:16.1.1"
+    image: "keycloak/keycloak:20.0.1"
+    entrypoint: >
+      bash -c "KC_DB_PASSWORD=\"$$(cat /run/secrets/db_password)\" /opt/keycloak/bin/kc.sh start"
     networks:
       - proxy
       - internal
@@ -11,15 +13,14 @@ services:
       - admin_password
       - db_password
     environment:
-      - DB_ADDR=db
+      - KC_DB=mariadb
-      - DB_DATABASE=keycloak
+      - KC_DB_URL_DATABASE=keycloak
-      - DB_PASSWORD_FILE=/run/secrets/db_password
+      - KC_DB_URL_HOST=db
-      - DB_USER=keycloak
+      - KC_HOSTNAME=${DOMAIN}
-      - DB_VENDOR=mariadb
+      - KC_PROXY=edge
-      - KEYCLOAK_PASSWORD_FILE=/run/secrets/admin_password
+      - KC_SPI_CONNECTIONS_JPA_LEGACY_MIGRATION_STRATEGY=update
-      - KEYCLOAK_USER=${ADMIN_USERNAME}
+      - KEYCLOAK_ADMIN=${ADMIN_USERNAME}
       - KEYCLOAK_WELCOME_THEME=${WELCOME_THEME}
-      - PROXY_ADDRESS_FORWARDING=true
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080"]
       interval: 30s
@@ -43,7 +44,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-        - "coop-cloud.${STACK_NAME}.version=4.0.1+16.1.1"
+        - "coop-cloud.${STACK_NAME}.version=5.0.0+20.0.1"
 
   db:
     image: "mariadb:10.6"
@@ -59,6 +60,12 @@ services:
       - "mariadb:/var/lib/mysql"
     networks:
       - internal
+    deploy:
+      labels:
+          backupbot.backup: "true"
+          backupbot.backup.pre-hook: 'mkdir -p /tmp/backup/ && mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" keycloak > /tmp/backup/backup.sql'
+          backupbot.backup.post-hook: "rm -rf /tmp/backup"
+          backupbot.backup.path: "/tmp/backup/"
 
 networks:
   internal:

release/5.0.0+20.0.1

@@ -0,0 +1,9 @@
+You'll need to remove `/auth/` from your app SSO URLs, e.g.
+
+    https://foo.example.com/auth/realms/foo/protocol/openid-connect/auth
+
+Would become:
+
+    https://foo.example.com/realms/foo/protocol/openid-connect/auth
+
+-- decentral1se @ Autonomic