chore: publish 10.3.0+26.2.1 release

Re: coop-cloud/recipes-catalogue-json#4

.drone.yml

@@ -3,10 +3,12 @@ kind: pipeline
 name: deploy to swarm-test.autonomic.zone
 steps:
   - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
       stack: keycloak
+      networks:
+       - proxy
       generate_secrets: true
       purge: true
       deploy_key:
@@ -23,11 +25,17 @@ trigger:
     - master
 ---
 kind: pipeline
-name: recipe release
+name: generate recipe catalogue
 steps:
   - name: release a new version
-    image: thecoopcloud/drone-abra:latest
+    image: plugins/downstream
     settings:
-      command: recipe keycloak release
+      server: https://build.coopcloud.tech
-      deploy_key:
+      token:
-        from_secret: abra_bot_deploy_key
+        from_secret: drone_abra-bot_token
+      fork: true
+      repositories:
+        - toolshed/auto-recipes-catalogue-json
+
+trigger:
+  event: tag

.env.sample

@@ -8,6 +8,11 @@ LETS_ENCRYPT_ENV=production
 ADMIN_USERNAME=admin
 WELCOME_THEME=keycloak
 
+COMPOSE_FILE="compose.yml"
+
 SECRET_DB_ROOT_PASSWORD_VERSION=v1
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_ADMIN_PASSWORD_VERSION=v1
+
+# Enable persistent theme volume, if you want to apply a custom theme
+#COMPOSE_FILE="$COMPOSE_FILE:compose.theme.yml"

README.md

@@ -21,9 +21,9 @@
 2. Deploy [`coop-cloud/traefik`][cc-traefik]
 3. `abra app new keycloak --secrets` (optionally with `--pass` if you'd like
    to save secrets in `pass`)
-4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
+4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
-5. `abra app YOURAPPDOMAIN deploy`
+5. `abra app deploy YOURAPPDOMAIN`
 
 ## How do I setup a custom theme?
 

compose.theme.yml

@@ -0,0 +1,10 @@
+---
+version: "3.8"
+
+services:
+  app:
+    volumes:
+      - "themes:/opt/keycloak/themes"
+
+volumes:
+  themes:

compose.yml

@@ -3,9 +3,9 @@ version: "3.8"
 
 services:
   app:
-    image: "keycloak/keycloak:20.0.1"
+    image: "keycloak/keycloak:26.2.1"
     entrypoint: >
-      bash -c "KC_DB_PASSWORD=\"$$(cat /run/secrets/db_password)\" /opt/keycloak/bin/kc.sh start"
+      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:
       - proxy
       - internal
@@ -16,19 +16,23 @@ services:
       - KC_DB=mariadb
       - KC_DB_URL_DATABASE=keycloak
       - KC_DB_URL_HOST=db
-      - KC_HOSTNAME=${DOMAIN}
+      - KC_HOSTNAME=https://${DOMAIN}
       - KC_PROXY=edge
       - KC_SPI_CONNECTIONS_JPA_LEGACY_MIGRATION_STRATEGY=update
       - KEYCLOAK_ADMIN=${ADMIN_USERNAME}
       - KEYCLOAK_WELCOME_THEME=${WELCOME_THEME}
-    healthcheck:
+      - KC_PROXY_HEADERS=xforwarded
-      test: ["CMD", "curl", "-f", "http://localhost:8080"]
+      - KC_HTTP_ENABLED=true
-      interval: 30s
+    # NOTE(3wc): disabled due to missing curl binary, see
-      timeout: 10s
+    #   https://git.coopcloud.tech/coop-cloud/keycloak/issues/15
-      retries: 10
+    # healthcheck:
-      start_period: 1m
+    #   test: ["CMD", "curl", "-f", "http://localhost:8080"]
+    #   interval: 30s
+    #   timeout: 10s
+    #   retries: 10
+    #   start_period: 1m
     volumes:
-      - "themes:/opt/jboss/keycloak/themes"
+      - "providers:/opt/keycloak/providers"
     depends_on:
       - mariadb
     deploy:
@@ -44,10 +48,13 @@ 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=5.0.0+20.0.1"
+        - "caddy=${DOMAIN}"
+        - "caddy.reverse_proxy={{upstreams 8080}}"
+        - "caddy.tls.on_demand="
+        - "coop-cloud.${STACK_NAME}.version=10.3.0+26.2.1"
 
   db:
-    image: "mariadb:10.6"
+    image: "mariadb:11.7"
     environment:
       - MYSQL_DATABASE=keycloak
       - MYSQL_USER=keycloak
@@ -62,10 +69,13 @@ services:
       - internal
     deploy:
       labels:
-          backupbot.backup: "true"
+        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.path: "/tmp/dump.sql.gz"
-          backupbot.backup.post-hook: "rm -rf /tmp/backup"
+        backupbot.backup.post-hook: "rm -f /tmp/dump.sql.gz"
-          backupbot.backup.path: "/tmp/backup/"
+        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'"
 
 networks:
   internal:
@@ -85,4 +95,4 @@ secrets:
 
 volumes:
   mariadb:
-  themes:
+  providers:

release/6.0.0+21.0.2

@@ -0,0 +1,2 @@
+Healthchecks are disabled, see
+https://git.coopcloud.tech/coop-cloud/keycloak/issues/15

release/7.2.0+22.0.5

@@ -0,0 +1,5 @@
+A persistent volume for themes is now optional, and not enabled by default.
+
+If you are using a custom theme, consult the recipe `.env.sample` to see the new
+variables you need to add. You can use `abra app check ...` to verify that
+they've been added correctly.