Merge pull request '10.6.1+26.5.4: fix backup/restore' (#24) from 10.6.1+26.5.4 into master

Reviewed-on: coop-cloud/keycloak#24
Reviewed-by: ammaratef45 <ammaratef45@proton.me>

README.md

@@ -64,7 +64,7 @@ Make sure to delete the temp-admin user after you finish recovering.
 - [Nextcloud][nextcloud]
 - [Peertube][peertube]
 
-[nextcloud]: https://git.coopcloud.tech/coop-cloud/nextcloud
-[peertube]: https://git.coopcloud.tech/coop-cloud/peertube
+[nextcloud]: https://git.coopcloud.tech/coop-cloud/nextcloud#how-do-i-integrate-with-keycloak-sso
+[peertube]: https://git.coopcloud.tech/coop-cloud/peertube#plugins
 [abra]: https://git.autonomic.zone/autonomic-cooperative/abra
 [cc-traefik]: https://git.autonomic.zone/coop-cloud/traefik

compose.theme.yml

@@ -1,6 +1,3 @@
----
-version: "3.8"
-
 services:
   app:
     volumes:

compose.yml

@@ -1,9 +1,6 @@
----
-version: "3.8"
-
 services:
   app:
-    image: "keycloak/keycloak:26.3.1"
+    image: "keycloak/keycloak:26.5.4"
     entrypoint: >
       bash -c "KEYCLOAK_ADMIN_PASSWORD=\"$$(cat /run/secrets/admin_password)\" KC_DB_PASSWORD=\"$$(cat /run/secrets/db_password)\" /opt/keycloak/bin/kc.sh start"
     networks:
@@ -51,10 +48,10 @@ services:
         - "caddy=${DOMAIN}"
         - "caddy.reverse_proxy={{upstreams 8080}}"
         - "caddy.tls.on_demand="
-        - "coop-cloud.${STACK_NAME}.version=10.4.0+26.3.1"
+        - "coop-cloud.${STACK_NAME}.version=10.6.1+26.5.4"
 
   db:
-    image: "mariadb:11.8"
+    image: "mariadb:12.2"
     environment:
       - MYSQL_DATABASE=keycloak
       - MYSQL_USER=keycloak
@@ -70,12 +67,10 @@ services:
     deploy:
       labels:
         backupbot.backup: "true"
-        backupbot.backup.path: "/tmp/dump.sql.gz"
-        backupbot.backup.post-hook: "rm -f /tmp/dump.sql.gz"
-        backupbot.backup.pre-hook: "sh -c 'mariadb-dump -u root -p\"$$(cat /run/secrets/db_root_password)\" keycloak | gzip > /tmp/dump.sql.gz'"
-        backupbot.restore.pre-hook: "sh -c 'cd /tmp && gzip -d dump.sql.gz'"
-        backupbot.restore: "true"
-        backupbot.restore.post-hook: "sh -c 'mariadb -u root -p\"$$(cat /run/secrets/db_root_password)\" keycloak < /tmp/dump.sql && rm -f /tmp/dump.sql'"
+        backupbot.backup.volumes.mariadb.path: "dump.sql.gz"
+        backupbot.backup.pre-hook: "sh -c 'mariadb-dump -u root -p\"$$(cat /run/secrets/db_root_password)\" keycloak | gzip > /var/lib/mysql/dump.sql.gz'"
+        backupbot.backup.post-hook: "rm -f /var/lib/mysql/dump.sql.gz"
+        backupbot.restore.post-hook: "sh -c 'gzip -d /var/lib/mysql/dump.sql.gz && mariadb -u root -p\"$$(cat /run/secrets/db_root_password)\" keycloak < /var/lib/mysql/dump.sql && rm -f /var/lib/mysql/dump.sql'"
 
 networks:
   internal:

release/10.5.0+26.4.0

@@ -0,0 +1 @@
+See here for possible breaking changes: https://www.keycloak.org/docs/latest/upgrading/#migrating-to-26-4-0