From f4bfd374f92bbe817f672d4454cf3d9e78f5a2bb Mon Sep 17 00:00:00 2001
From: c6ristian <c6ristian@christian.moe>
Date: Mon, 2 Jun 2025 19:24:35 +0200
Subject: [PATCH 1/4] alertmanager-ntfy

---
 .woodpecker/alertmanager-ntfy.yaml | 73 ++++++++++++++++++++++++++++++
 alertmanager-ntfy/Containerfile    | 14 ++++++
 2 files changed, 87 insertions(+)
 create mode 100644 .woodpecker/alertmanager-ntfy.yaml
 create mode 100644 alertmanager-ntfy/Containerfile

diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml
new file mode 100644
index 0000000..d92a169
--- /dev/null
+++ b/.woodpecker/alertmanager-ntfy.yaml
@@ -0,0 +1,73 @@
+when:
+  - event: push
+    path:
+      - 'alertmanager-ntfy/**'
+      - '.woodpecker/alertmanager-ntfy.yaml'
+  - event: cron
+    cron: daily
+
+# Manually set a workspace path, so we can use it literally, without using
+# ${CI_WORKSPACE}, when running kaniko, since using ${CI_WORKSPACE} doesn't work.
+# https://github.com/woodpecker-ci/woodpecker/issues/3982
+workspace:
+  path: src
+
+matrix:
+  ALERTMANAGER-NTFY_VERSION:
+    - 76d5f772f70d6915c89da00414c20009b03cc361
+  IMAGE_NAME:
+  - git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy
+
+steps:
+  - name: setup
+    image: alpine
+    commands:
+      - apk -u add git
+      - mkdir /woodpecker/images
+      - git clone --revision=${ALERTMANAGER-NTFY_VERSION} https://github.com/alexbakker/alertmanager-ntfy.git
+      - ls
+
+#  - name: build-image
+#    image: gcr.io/kaniko-project/executor
+#    entrypoint:
+#      - /kaniko/executor
+#      - --context=dir:///woodpecker/src/alertmanager-ntfy
+#      - --dockerfile=./Containerfile
+#      - --destination=${IMAGE_NAME}:${ALERTMANAGER-NTFY_VERSION}
+#      - --no-push
+#      - --tar-path=/woodpecker/images/alertmanager-ntfy.tar
+#
+#  - name: publish-image
+#    image: alpine
+#    environment:
+#      GIT_API_TOKEN:
+#        from_secret: GIT_API_TOKEN
+#    commands:
+#      - apk -u add crane
+#      - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
+#      - crane push /woodpecker/images/keycloak.tar $IMAGE_NAME:$ALERTMANAGER-NTFY_VERSION-$CI_COMMIT_BRANCH
+#
+#  - name: tag-version
+#    image: alpine
+#    when:
+#      - branch: main
+#    environment:
+#      GIT_API_TOKEN:
+#        from_secret: GIT_API_TOKEN
+#    commands:
+#      - apk -u add crane
+#      - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
+#      - crane tag $IMAGE_NAME:$ALERTMANAGER-NTFY_VERSION-$CI_COMMIT_BRANCH $ALERTMANAGER-NTFY_VERSION
+#
+#  - name: tag-latest
+#    image: alpine
+#    when:
+#      - branch: main
+#        evaluate: 'KEYCLOAK_VERSION == "26.0"'
+#    environment:
+#      GIT_API_TOKEN:
+#        from_secret: GIT_API_TOKEN
+#    commands:
+#      - apk -u add crane
+#      - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
+#      - crane tag $IMAGE_NAME:$ALERTMANAGER-NTFY_VERSION-$CI_COMMIT_BRANCH latest
diff --git a/alertmanager-ntfy/Containerfile b/alertmanager-ntfy/Containerfile
new file mode 100644
index 0000000..8f45f75
--- /dev/null
+++ b/alertmanager-ntfy/Containerfile
@@ -0,0 +1,14 @@
+ARG TAG=latest
+FROM docker.io/golang:${TAG} as builder
+ARG CGO_ENABLED=0
+WORKDIR /app
+
+COPY go.mod go.sum ./
+RUN go mod download
+COPY . .
+
+RUN go build
+
+FROM scratch
+COPY --from=builder /app/alertmanager-ntfy /alertmanager-ntfy
+ENTRYPOINT ["/alertmanager-ntfy"]
\ No newline at end of file

From 1e323bfa923aac17a8b21bfb775e19017b868777 Mon Sep 17 00:00:00 2001
From: c6ristian <c6ristian@christian.moe>
Date: Tue, 24 Jun 2025 22:51:06 +0200
Subject: [PATCH 2/4] remove never used image build

---
 .woodpecker/alertmanager-ntfy.yaml | 73 ------------------------------
 alertmanager-ntfy/Containerfile    | 14 ------
 2 files changed, 87 deletions(-)
 delete mode 100644 .woodpecker/alertmanager-ntfy.yaml
 delete mode 100644 alertmanager-ntfy/Containerfile

diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml
deleted file mode 100644
index d92a169..0000000
--- a/.woodpecker/alertmanager-ntfy.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-when:
-  - event: push
-    path:
-      - 'alertmanager-ntfy/**'
-      - '.woodpecker/alertmanager-ntfy.yaml'
-  - event: cron
-    cron: daily
-
-# Manually set a workspace path, so we can use it literally, without using
-# ${CI_WORKSPACE}, when running kaniko, since using ${CI_WORKSPACE} doesn't work.
-# https://github.com/woodpecker-ci/woodpecker/issues/3982
-workspace:
-  path: src
-
-matrix:
-  ALERTMANAGER-NTFY_VERSION:
-    - 76d5f772f70d6915c89da00414c20009b03cc361
-  IMAGE_NAME:
-  - git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy
-
-steps:
-  - name: setup
-    image: alpine
-    commands:
-      - apk -u add git
-      - mkdir /woodpecker/images
-      - git clone --revision=${ALERTMANAGER-NTFY_VERSION} https://github.com/alexbakker/alertmanager-ntfy.git
-      - ls
-
-#  - name: build-image
-#    image: gcr.io/kaniko-project/executor
-#    entrypoint:
-#      - /kaniko/executor
-#      - --context=dir:///woodpecker/src/alertmanager-ntfy
-#      - --dockerfile=./Containerfile
-#      - --destination=${IMAGE_NAME}:${ALERTMANAGER-NTFY_VERSION}
-#      - --no-push
-#      - --tar-path=/woodpecker/images/alertmanager-ntfy.tar
-#
-#  - name: publish-image
-#    image: alpine
-#    environment:
-#      GIT_API_TOKEN:
-#        from_secret: GIT_API_TOKEN
-#    commands:
-#      - apk -u add crane
-#      - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
-#      - crane push /woodpecker/images/keycloak.tar $IMAGE_NAME:$ALERTMANAGER-NTFY_VERSION-$CI_COMMIT_BRANCH
-#
-#  - name: tag-version
-#    image: alpine
-#    when:
-#      - branch: main
-#    environment:
-#      GIT_API_TOKEN:
-#        from_secret: GIT_API_TOKEN
-#    commands:
-#      - apk -u add crane
-#      - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
-#      - crane tag $IMAGE_NAME:$ALERTMANAGER-NTFY_VERSION-$CI_COMMIT_BRANCH $ALERTMANAGER-NTFY_VERSION
-#
-#  - name: tag-latest
-#    image: alpine
-#    when:
-#      - branch: main
-#        evaluate: 'KEYCLOAK_VERSION == "26.0"'
-#    environment:
-#      GIT_API_TOKEN:
-#        from_secret: GIT_API_TOKEN
-#    commands:
-#      - apk -u add crane
-#      - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
-#      - crane tag $IMAGE_NAME:$ALERTMANAGER-NTFY_VERSION-$CI_COMMIT_BRANCH latest
diff --git a/alertmanager-ntfy/Containerfile b/alertmanager-ntfy/Containerfile
deleted file mode 100644
index 8f45f75..0000000
--- a/alertmanager-ntfy/Containerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-ARG TAG=latest
-FROM docker.io/golang:${TAG} as builder
-ARG CGO_ENABLED=0
-WORKDIR /app
-
-COPY go.mod go.sum ./
-RUN go mod download
-COPY . .
-
-RUN go build
-
-FROM scratch
-COPY --from=builder /app/alertmanager-ntfy /alertmanager-ntfy
-ENTRYPOINT ["/alertmanager-ntfy"]
\ No newline at end of file

From 1f3e972fbd036a38131cefdf7d283780c31648f3 Mon Sep 17 00:00:00 2001
From: c6ristian <c6ristian@christian.moe>
Date: Sun, 29 Jun 2025 20:33:09 +0200
Subject: [PATCH 3/4] fix secrets

---
 .woodpecker/penpot.yaml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.woodpecker/penpot.yaml b/.woodpecker/penpot.yaml
index 9e79d1b..8cedcbe 100644
--- a/.woodpecker/penpot.yaml
+++ b/.woodpecker/penpot.yaml
@@ -64,8 +64,9 @@ steps:
 
   - name: publish-image
     image: docker.io/library/alpine
-    secrets:
-      - GIT_API_TOKEN
+    environment:
+      GIT_API_TOKEN:
+        from_secret: GIT_API_TOKEN
     commands:
       - apk -u add crane
       - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
@@ -75,8 +76,9 @@ steps:
     image: docker.io/library/alpine
     when:
       - branch: main
-    secrets:
-      - GIT_API_TOKEN
+    environment:
+      GIT_API_TOKEN:
+        from_secret: GIT_API_TOKEN
     commands:
       - apk -u add crane
       - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN
@@ -87,8 +89,9 @@ steps:
     when:
       - branch: main
         evaluate: 'PENPOT_VERSION == "2.1.2"'
-    secrets:
-      - GIT_API_TOKEN
+    environment:
+      GIT_API_TOKEN:
+        from_secret: GIT_API_TOKEN
     commands:
       - apk -u add crane
       - crane auth login git.hamburg.ccc.de -u woodpecker -p $GIT_API_TOKEN

From b722397a8be291c9dd8631092a4b22257d11111f Mon Sep 17 00:00:00 2001
From: c6ristian <c6ristian@christian.moe>
Date: Sun, 29 Jun 2025 20:34:53 +0200
Subject: [PATCH 4/4] do not build eol keycloak and nextcloud

---
 .woodpecker/keycloak.yaml  | 1 -
 .woodpecker/nextcloud.yaml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.woodpecker/keycloak.yaml b/.woodpecker/keycloak.yaml
index dc64f11..5c3433a 100644
--- a/.woodpecker/keycloak.yaml
+++ b/.woodpecker/keycloak.yaml
@@ -19,7 +19,6 @@ workspace:
 # Also because global environment variables aren't a thing.
 matrix:
   KEYCLOAK_VERSION:
-    - 26.0
     - 26.1
     - 26.2
   IMAGE_NAME:
diff --git a/.woodpecker/nextcloud.yaml b/.woodpecker/nextcloud.yaml
index a9b3fa2..d570293 100644
--- a/.woodpecker/nextcloud.yaml
+++ b/.woodpecker/nextcloud.yaml
@@ -19,7 +19,6 @@ workspace:
 # Also because global environment variables aren't a thing.
 matrix:
   NEXTCLOUD_VERSION:
-    - 29
     - 30
     - 31
   IMAGE_NAME: