From 3b8232cab12876bd21264426f739806035adae54 Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 25 Jun 2026 21:55:28 +0200 Subject: [PATCH 1/7] build_nextcloud: remove version 32 --- .forgejo/workflows/build_nextcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build_nextcloud.yml b/.forgejo/workflows/build_nextcloud.yml index e2538a9..9e625d7 100644 --- a/.forgejo/workflows/build_nextcloud.yml +++ b/.forgejo/workflows/build_nextcloud.yml @@ -14,7 +14,7 @@ jobs: image: ghcr.io/osscontainertools/kaniko:alpine strategy: matrix: - nextcloud-version: [ 32, 33 ] + nextcloud-version: [ 33 ] steps: - name: Install required system packages run: apk add --no-cache nodejs From 8a55eae92b8ee0df09b6ec79ca3ab9afe702691b Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 26 Jun 2026 19:15:39 +0200 Subject: [PATCH 2/7] nextcloud: build nextcloud 34 --- .forgejo/workflows/build_nextcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build_nextcloud.yml b/.forgejo/workflows/build_nextcloud.yml index 9e625d7..7eee44e 100644 --- a/.forgejo/workflows/build_nextcloud.yml +++ b/.forgejo/workflows/build_nextcloud.yml @@ -14,7 +14,7 @@ jobs: image: ghcr.io/osscontainertools/kaniko:alpine strategy: matrix: - nextcloud-version: [ 33 ] + nextcloud-version: [ 33, 34 ] steps: - name: Install required system packages run: apk add --no-cache nodejs From 8c2b24cd837d36593ad223ef08b85afb3454b33a Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 30 Jun 2026 22:00:27 +0200 Subject: [PATCH 3/7] move java build process to build container --- .forgejo/workflows/build_keycloak.yml | 9 +-------- keycloak/Containerfile | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/build_keycloak.yml b/.forgejo/workflows/build_keycloak.yml index 606ab21..9c4d246 100644 --- a/.forgejo/workflows/build_keycloak.yml +++ b/.forgejo/workflows/build_keycloak.yml @@ -18,18 +18,11 @@ jobs: keycloak-version: [ 26.6.1, 26.6.2, 26.6.3 ] steps: - name: Install required system packages - run: apk add --no-cache nodejs maven git + run: apk add --no-cache nodejs - name: Checkout Source Code uses: actions/checkout@v6 - - name: Build attribute-endpoints-provider - run: | - git clone https://git.hamburg.ccc.de/CCCHH/keycloak-attribute-endpoints-provider.git - cd keycloak-attribute-endpoints-provider - mvn -f attribute-endpoints-provider verify - cp attribute-endpoints-provider/target/attribute-endpoints-provider-1.0-SNAPSHOT.jar ${{ forgejo.workspace }}/keycloak/attribute-endpoints-provider.jar - - name: Build Container env: KANIKO_NO_PUSH: ${{ forgejo.ref_name != 'main' }} diff --git a/keycloak/Containerfile b/keycloak/Containerfile index f3f6c1e..0f6f1fc 100644 --- a/keycloak/Containerfile +++ b/keycloak/Containerfile @@ -1,13 +1,33 @@ ARG TAG=latest + +FROM debian:12-slim as attribute-endpoints-provider-builder + +RUN apt-get update \ + && apt-get install --no-install-recommends --no-install-suggests -y maven git \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir /maven +RUN git clone https://git.hamburg.ccc.de/CCCHH/keycloak-attribute-endpoints-provider.git /maven/keycloak-attribute-endpoints-provider + +WORKDIR /maven/keycloak-attribute-endpoints-provider + +RUN mvn -f attribute-endpoints-provider verify + +RUN mv attribute-endpoints-provider/target/attribute-endpoints-provider-*.jar /maven/attribute-endpoints-provider.jar + + FROM quay.io/keycloak/keycloak:${TAG} as builder ENV KC_DB=postgres ENV KC_FEATURES=declarative-ui WORKDIR /opt/keycloak -ADD --chown=keycloak:keycloak --chmod=644 attribute-endpoints-provider.jar /opt/keycloak/providers/attribute-endpoints-provider.jar + +COPY --from=attribute-endpoints-provider-builder /maven/attribute-endpoints-provider.jar /opt/keycloak/providers/attribute-endpoints-provider.jar + RUN /opt/keycloak/bin/kc.sh build + FROM quay.io/keycloak/keycloak:${TAG} COPY --from=builder /opt/keycloak/ /opt/keycloak/ ADD themes/ /opt/keycloak/themes/ From c7ac4a471e45be507666dba71cb726095233c142 Mon Sep 17 00:00:00 2001 From: Renovate Date: Tue, 30 Jun 2026 20:16:29 +0000 Subject: [PATCH 4/7] 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 5/7] 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 6/7] 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 7/7] 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