From c7ac4a471e45be507666dba71cb726095233c142 Mon Sep 17 00:00:00 2001 From: Renovate Date: Tue, 30 Jun 2026 20:16:29 +0000 Subject: [PATCH 01/13] Update debian Docker tag to v13 --- keycloak/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keycloak/Containerfile b/keycloak/Containerfile index 0f6f1fc..72ff902 100644 --- a/keycloak/Containerfile +++ b/keycloak/Containerfile @@ -1,6 +1,6 @@ ARG TAG=latest -FROM debian:12-slim as attribute-endpoints-provider-builder +FROM debian:13-slim as attribute-endpoints-provider-builder RUN apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y maven git \ From 4cc2bd594df1e98298761175857e8c2c7097f411 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 30 Jun 2026 16:58:52 +0200 Subject: [PATCH 02/13] build nextcloud image from source --- .forgejo/workflows/build_nextcloud.yml | 26 ++++++++++++++++++++++---- nextcloud/Containerfile | 8 ++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/build_nextcloud.yml b/.forgejo/workflows/build_nextcloud.yml index 7eee44e..588f33b 100644 --- a/.forgejo/workflows/build_nextcloud.yml +++ b/.forgejo/workflows/build_nextcloud.yml @@ -17,18 +17,36 @@ jobs: nextcloud-version: [ 33, 34 ] steps: - name: Install required system packages - run: apk add --no-cache nodejs + run: apk add --no-cache nodejs git - - name: Checkout Source Code + - name: Checkout source code uses: actions/checkout@v6 - - name: Build Container + - name: Checkout nextcloud/docker + run: git clone --depth 1 https://github.com/nextcloud/docker.git nextcloud-docker + + - name: Build base Nextcloud image env: KANIKO_NO_PUSH: ${{ forgejo.ref_name != 'main' }} KANIKO_GIT_HAMBURG_CCC_DE_USER: forgejo-actions KANIKO_GIT_HAMBURG_CCC_DE_PASSWORD: ${{ secrets.PACKAGES_TOKEN }} run: /kaniko/executor - --dockerfile="${{forgejo.workspace }}/nextcloud/Containerfile" + --dockerfile="${{ forgejo.workspace }}/nextcloud-docker/${{ matrix.nextcloud-version }}/apache/Dockerfile" + --context="dir://${{ forgejo.workspace }}/nextcloud-docker/${{ matrix.nextcloud-version }}/apache" + --build-arg=TAG=${{ matrix.nextcloud-version }} + --destination=git.hamburg.ccc.de/ccchh/oci-images/nextcloud-base:${{ matrix.nextcloud-version }} + --no-push-cache + --credential-helpers=env + --annotation=org.opencontainers.image.ref.name=nextcloud-base + --annotation=org.opencontainers.image.source=${{ forgejo.server_url }}/${{ forgejo.repository }} + + - name: Build extended image + env: + KANIKO_NO_PUSH: ${{ forgejo.ref_name != 'main' }} + KANIKO_GIT_HAMBURG_CCC_DE_USER: forgejo-actions + KANIKO_GIT_HAMBURG_CCC_DE_PASSWORD: ${{ secrets.PACKAGES_TOKEN }} + run: /kaniko/executor + --dockerfile="${{ forgejo.workspace }}/nextcloud/Containerfile" --context="dir://${{ forgejo.workspace }}/nextcloud" --build-arg=TAG=${{ matrix.nextcloud-version }} --destination=git.hamburg.ccc.de/ccchh/oci-images/nextcloud:${{ matrix.nextcloud-version }} diff --git a/nextcloud/Containerfile b/nextcloud/Containerfile index d139a4d..d76a998 100644 --- a/nextcloud/Containerfile +++ b/nextcloud/Containerfile @@ -1,10 +1,10 @@ -ARG TAG=latest -FROM docker.io/library/nextcloud:${TAG} +ARG TAG +FROM git.hamburg.ccc.de/ccchh/oci-images/nextcloud-base:${TAG} RUN apt-get update \ && apt-get install -y supervisor \ && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /var/log/supervisord /var/run/supervisord + && mkdir -p /var/log/supervisord /var/run/supervisord # We need to copy a file to the supervisord folder in /var/run so it exists when the container starts. COPY .keep /var/run/supervisord/ @@ -13,4 +13,4 @@ COPY supervisord.conf / ENV NEXTCLOUD_UPDATE=1 -CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] \ No newline at end of file +CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] From 72eb0a9080720005de61d7f7edd7e325fd4edd97 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 30 Jun 2026 22:30:40 +0200 Subject: [PATCH 03/13] make renovate track nextcloud versions --- .forgejo/workflows/build_nextcloud.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/build_nextcloud.yml b/.forgejo/workflows/build_nextcloud.yml index 588f33b..a85a4c4 100644 --- a/.forgejo/workflows/build_nextcloud.yml +++ b/.forgejo/workflows/build_nextcloud.yml @@ -14,6 +14,7 @@ jobs: image: ghcr.io/osscontainertools/kaniko:alpine strategy: matrix: + # renovate: datasource=docker depName=docker.io/library/nextcloud nextcloud-version: [ 33, 34 ] steps: - name: Install required system packages From a866d88b50fcb14a9b4a6849e97f2ee669baeb77 Mon Sep 17 00:00:00 2001 From: Renovate Date: Wed, 1 Jul 2026 19:01:17 +0000 Subject: [PATCH 04/13] Update actions/checkout action to v7 --- .forgejo/workflows/build_keycloak.yml | 2 +- .forgejo/workflows/build_nextcloud.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml index 9c4d246..a2b3b81 100644 --- a/.forgejo/workflows/build_keycloak.yml +++ b/.forgejo/workflows/build_keycloak.yml @@ -21,7 +21,7 @@ jobs: run: apk add --no-cache nodejs - name: Checkout Source Code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Build Container env: diff --git a/.forgejo/workflows/build_nextcloud.yml b/.forgejo/workflows/build_nextcloud.yml index a85a4c4..d9772ae 100644 --- a/.forgejo/workflows/build_nextcloud.yml +++ b/.forgejo/workflows/build_nextcloud.yml @@ -21,7 +21,7 @@ jobs: run: apk add --no-cache nodejs git - name: Checkout source code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Checkout nextcloud/docker run: git clone --depth 1 https://github.com/nextcloud/docker.git nextcloud-docker From 5bfc2992a92a111c21ed674e24e4a8d359c2261c Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 19 Aug 2026 16:20:30 +0200 Subject: [PATCH 05/13] only trigger affected image builds on push --- .forgejo/workflows/build_keycloak.yml | 5 ++++- .forgejo/workflows/build_nextcloud.yml | 5 ++++- .forgejo/workflows/build_penpot.yml | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml index a2b3b81..5bb0861 100644 --- a/.forgejo/workflows/build_keycloak.yml +++ b/.forgejo/workflows/build_keycloak.yml @@ -2,7 +2,10 @@ name: Build Keycloak on: workflow_dispatch: {} - push: {} + push: + paths: + - '.forgejo/workflows/build_keycloak.yml' + - 'keycloak/**' schedule: - cron: "@daily" diff --git a/.forgejo/workflows/build_nextcloud.yml b/.forgejo/workflows/build_nextcloud.yml index d9772ae..cf40e2e 100644 --- a/.forgejo/workflows/build_nextcloud.yml +++ b/.forgejo/workflows/build_nextcloud.yml @@ -2,7 +2,10 @@ name: Build Nextcloud on: workflow_dispatch: {} - push: {} + push: + paths: + - '.forgejo/workflows/build_nextcloud.yml' + - 'nextcloud/**' schedule: - cron: "@daily" diff --git a/.forgejo/workflows/build_penpot.yml b/.forgejo/workflows/build_penpot.yml index c067263..2108c4b 100644 --- a/.forgejo/workflows/build_penpot.yml +++ b/.forgejo/workflows/build_penpot.yml @@ -2,7 +2,9 @@ name: Build Penpot on: workflow_dispatch: {} - push: {} + push: + paths: + - '.forgejo/workflows/build_penpot.yml' schedule: - cron: "@daily" From 08c3cd32f405edc8576746a1f623cc10442ad474 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 19 Aug 2026 16:42:37 +0200 Subject: [PATCH 06/13] fix renovate version matcher --- .forgejo/workflows/build_keycloak.yml | 3 ++- .forgejo/workflows/build_nextcloud.yml | 5 +++-- renovate.json | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml index 5bb0861..59758f8 100644 --- a/.forgejo/workflows/build_keycloak.yml +++ b/.forgejo/workflows/build_keycloak.yml @@ -17,8 +17,9 @@ jobs: image: ghcr.io/osscontainertools/kaniko:alpine strategy: matrix: - # renovate: datasource=docker depName=quay.io/keycloak/keycloak keycloak-version: [ 26.6.1, 26.6.2, 26.6.3 ] + # renovate: datasource=docker depName=quay.io/keycloak/keycloak + - 26.6.3 steps: - name: Install required system packages run: apk add --no-cache nodejs diff --git a/.forgejo/workflows/build_nextcloud.yml b/.forgejo/workflows/build_nextcloud.yml index cf40e2e..4d2e866 100644 --- a/.forgejo/workflows/build_nextcloud.yml +++ b/.forgejo/workflows/build_nextcloud.yml @@ -17,8 +17,9 @@ jobs: image: ghcr.io/osscontainertools/kaniko:alpine strategy: matrix: - # renovate: datasource=docker depName=docker.io/library/nextcloud - nextcloud-version: [ 33, 34 ] + nextcloud-version: + # renovate: datasource=docker depName=docker.io/library/nextcloud + - 34 steps: - name: Install required system packages run: apk add --no-cache nodejs git diff --git a/renovate.json b/renovate.json index 7f0cc8d..9174826 100644 --- a/renovate.json +++ b/renovate.json @@ -4,11 +4,11 @@ "config:recommended" ], "customManagers": [ - // Custom manager using regex for letting Renovate find dependencies in woodpecker Matrix variables. + // Custom manager using regex for letting Renovate find dependencies in matrix variables { "customType": "regex", "managerFilePatterns": [ - "/^\\.woodpecker/.*\\.ya?ml$/" + "/^\\.forgejo/workflows/.*\\.ya?ml$/" ], "matchStrings": [ "# renovate: datasource=(?[a-zA-Z0-9-._]+?) depName=(?[^\\s]+?)(?: packageName=(?[^\\s]+?))?(?: versioning=(?[^\\s]+?))?\\s*-\\s*[\"']?(?.+?)[\"']?\\s" From e615ae69f576b0e4e72ee698de330076b50dd303 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 19 Aug 2026 16:43:49 +0200 Subject: [PATCH 07/13] automerge minor and patch updates --- renovate.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/renovate.json b/renovate.json index 9174826..099905b 100644 --- a/renovate.json +++ b/renovate.json @@ -3,6 +3,15 @@ "extends": [ "config:recommended" ], + "packageRules": [ + // Automatically merge patch level updates + // https://docs.renovatebot.com/key-concepts/automerge/ + { + "matchUpdateTypes": ["minor", "patch"], + "matchCurrentVersion": "!/^0/", + "automerge": true + } + ], "customManagers": [ // Custom manager using regex for letting Renovate find dependencies in matrix variables { From e03f1503235eb4a28ae9fb6dc45372bd4af390b8 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 19 Aug 2026 16:45:06 +0200 Subject: [PATCH 08/13] fix copy and paste mistake --- .forgejo/workflows/build_keycloak.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml index 59758f8..d2aa5cd 100644 --- a/.forgejo/workflows/build_keycloak.yml +++ b/.forgejo/workflows/build_keycloak.yml @@ -17,7 +17,7 @@ jobs: image: ghcr.io/osscontainertools/kaniko:alpine strategy: matrix: - keycloak-version: [ 26.6.1, 26.6.2, 26.6.3 ] + keycloak-version: # renovate: datasource=docker depName=quay.io/keycloak/keycloak - 26.6.3 steps: From b89324a36ae90c8dfdc4d4cb38bf13c91804795e Mon Sep 17 00:00:00 2001 From: Renovate Date: Wed, 19 Aug 2026 15:16:47 +0000 Subject: [PATCH 09/13] Update quay.io/keycloak/keycloak Docker tag to v26.7.2 --- .forgejo/workflows/build_keycloak.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml index d2aa5cd..fc0f723 100644 --- a/.forgejo/workflows/build_keycloak.yml +++ b/.forgejo/workflows/build_keycloak.yml @@ -19,7 +19,7 @@ jobs: matrix: keycloak-version: # renovate: datasource=docker depName=quay.io/keycloak/keycloak - - 26.6.3 + - 26.7.2 steps: - name: Install required system packages run: apk add --no-cache nodejs From f90c145538908a477f7cab1abc3ebab54818bd13 Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Tue, 25 Aug 2026 18:41:11 +0200 Subject: [PATCH 10/13] Build minor version Until we figure out what the breaking changes in 26.7 might be --- .forgejo/workflows/build_keycloak.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml index fc0f723..9c26874 100644 --- a/.forgejo/workflows/build_keycloak.yml +++ b/.forgejo/workflows/build_keycloak.yml @@ -20,6 +20,7 @@ jobs: keycloak-version: # renovate: datasource=docker depName=quay.io/keycloak/keycloak - 26.7.2 + - 26.6.4 # until we are sure we can go to 26.7 steps: - name: Install required system packages run: apk add --no-cache nodejs From 732c6db9bff3528b728c157d92ab8425710776ad Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Tue, 25 Aug 2026 18:57:34 +0200 Subject: [PATCH 11/13] Remove old version --- .forgejo/workflows/build_keycloak.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml index 9c26874..fc0f723 100644 --- a/.forgejo/workflows/build_keycloak.yml +++ b/.forgejo/workflows/build_keycloak.yml @@ -20,7 +20,6 @@ jobs: keycloak-version: # renovate: datasource=docker depName=quay.io/keycloak/keycloak - 26.7.2 - - 26.6.4 # until we are sure we can go to 26.7 steps: - name: Install required system packages run: apk add --no-cache nodejs From 70e628607364846cbb1c1b74e3b55445175d20a1 Mon Sep 17 00:00:00 2001 From: Renovate Date: Mon, 31 Aug 2026 09:46:26 +0000 Subject: [PATCH 12/13] Update quay.io/keycloak/keycloak Docker tag to v26.7.3 --- .forgejo/workflows/build_keycloak.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml index fc0f723..285a084 100644 --- a/.forgejo/workflows/build_keycloak.yml +++ b/.forgejo/workflows/build_keycloak.yml @@ -19,7 +19,7 @@ jobs: matrix: keycloak-version: # renovate: datasource=docker depName=quay.io/keycloak/keycloak - - 26.7.2 + - 26.7.3 steps: - name: Install required system packages run: apk add --no-cache nodejs From 76fb84be3620d3ce9cde6f2fd2dc6e7319923b7f Mon Sep 17 00:00:00 2001 From: Renovate Date: Wed, 16 Sep 2026 15:01:50 +0000 Subject: [PATCH 13/13] Update quay.io/keycloak/keycloak Docker tag to v26.7.4 --- .forgejo/workflows/build_keycloak.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml index 285a084..a2c2d2f 100644 --- a/.forgejo/workflows/build_keycloak.yml +++ b/.forgejo/workflows/build_keycloak.yml @@ -19,7 +19,7 @@ jobs: matrix: keycloak-version: # renovate: datasource=docker depName=quay.io/keycloak/keycloak - - 26.7.3 + - 26.7.4 steps: - name: Install required system packages run: apk add --no-cache nodejs