From eb9685a7c2705fdbd7a5021134a3d602192220a1 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:24:35 +0200 Subject: [PATCH 01/29] alertmanager-ntfy --- .woodpecker/alertmanager-ntfy.yaml | 60 ++++++++++++++++++++++++++++++ alertmanager-ntfy/Containerfile | 14 +++++++ 2 files changed, 74 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..1b6bc72 --- /dev/null +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -0,0 +1,60 @@ +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 \ No newline at end of file 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 876e7f39cbfc68e7c15f2923c26f7f752aaf2ce6 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:38:05 +0200 Subject: [PATCH 02/29] i try --- .woodpecker/alertmanager-ntfy.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 1b6bc72..28d8589 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -1,11 +1,3 @@ -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 From 004f445ba52b9ae5111787932dee5ecc36bfa143 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:39:24 +0200 Subject: [PATCH 03/29] Update alertmanager-ntfy --- .woodpecker/alertmanager-ntfy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 28d8589..14c6fd0 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -25,7 +25,7 @@ steps: - /kaniko/executor - --context=dir:///woodpecker/src/alertmanager-ntfy - --dockerfile=./Containerfile - - --destination=${IMAGE_NAME}:${ALERTMANAGER-NTFY_VERSION} + - --destination=git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy:${ALERTMANAGER-NTFY_VERSION} - --no-push - --tar-path=/woodpecker/images/alertmanager-ntfy.tar From c99edca2ce48ef2a16b2209fe86e91a1015c6099 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:46:17 +0200 Subject: [PATCH 04/29] Update alertmanager-ntfy --- .woodpecker/alertmanager-ntfy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 14c6fd0..fa59558 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -16,7 +16,7 @@ steps: commands: - apk -u add git - mkdir /woodpecker/images - - git clone --revision=${ALERTMANAGER_NTFY_VERSION} https://github.com/alexbakker/alertmanager-ntfy.git + - git clone --revision ${ALERTMANAGER_NTFY_VERSION} https://github.com/alexbakker/alertmanager-ntfy.git - ls - name: build-image From 9b669917f55c0f983b77b54c4fa4b1aac09debc0 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:49:59 +0200 Subject: [PATCH 05/29] Update alertmanager-ntfy --- .woodpecker/alertmanager-ntfy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index fa59558..f80e70c 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -6,9 +6,9 @@ workspace: matrix: ALERTMANAGER_NTFY_VERSION: - - 76d5f772f70d6915c89da00414c20009b03cc361 + - "76d5f772f70d6915c89da00414c20009b03cc361" IMAGE_NAME: - - git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy + - "git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy" steps: - name: setup From 7b0f9d40e84ce2731853ac41dee6a632fec19850 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:52:47 +0200 Subject: [PATCH 06/29] Update alertmanager-ntfy --- .woodpecker/alertmanager-ntfy.yaml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index f80e70c..ac7e565 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -28,25 +28,3 @@ steps: - --destination=git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy:${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 \ No newline at end of file From 5f6a49c4fdf9343774bee5cd42005591b6fdbde3 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:54:08 +0200 Subject: [PATCH 07/29] Update alertmanager-ntfy --- .woodpecker/alertmanager-ntfy.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index ac7e565..fb19efa 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -1,9 +1,3 @@ -# 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" From 6acedcc102612f07913b6f591693af7573fc2467 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:55:13 +0200 Subject: [PATCH 08/29] Update alertmanager-ntfy --- .woodpecker/alertmanager-ntfy.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index fb19efa..51b96e8 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -1,16 +1,10 @@ -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 + - git clone --revision 76d5f772f70d6915c89da00414c20009b03cc361 https://github.com/alexbakker/alertmanager-ntfy.git - ls - name: build-image @@ -19,6 +13,6 @@ steps: - /kaniko/executor - --context=dir:///woodpecker/src/alertmanager-ntfy - --dockerfile=./Containerfile - - --destination=git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy:${ALERTMANAGER-NTFY_VERSION} + - --destination=git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy:76d5f772f70d6915c89da00414c20009b03cc361 - --no-push - --tar-path=/woodpecker/images/alertmanager-ntfy.tar From 611a1fa9bd9aeeb49706410b0b68a54739c63f8c Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:56:01 +0200 Subject: [PATCH 09/29] fix --- .woodpecker/penpot.yaml => penpot.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .woodpecker/penpot.yaml => penpot.yaml (100%) diff --git a/.woodpecker/penpot.yaml b/penpot.yaml similarity index 100% rename from .woodpecker/penpot.yaml rename to penpot.yaml From 231552e4786bf7b9ba781a148ec154c1c24e3bef Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:56:58 +0200 Subject: [PATCH 10/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 46 ++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 51b96e8..1b6bc72 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -1,10 +1,30 @@ +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 76d5f772f70d6915c89da00414c20009b03cc361 https://github.com/alexbakker/alertmanager-ntfy.git + - git clone --revision=${ALERTMANAGER_NTFY_VERSION} https://github.com/alexbakker/alertmanager-ntfy.git - ls - name: build-image @@ -13,6 +33,28 @@ steps: - /kaniko/executor - --context=dir:///woodpecker/src/alertmanager-ntfy - --dockerfile=./Containerfile - - --destination=git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy:76d5f772f70d6915c89da00414c20009b03cc361 + - --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 \ No newline at end of file From 40eafe2479b799791739e1252994241679e796db Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:57:36 +0200 Subject: [PATCH 11/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 1b6bc72..feee017 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -6,9 +6,6 @@ when: - 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 @@ -36,25 +33,3 @@ steps: - --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 \ No newline at end of file From b15dd6bd0ddffc0db4f0f46326ce9b6b74e18820 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:57:59 +0200 Subject: [PATCH 12/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index feee017..ed0a895 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -6,9 +6,6 @@ when: - event: cron cron: daily -workspace: - path: src - matrix: ALERTMANAGER_NTFY_VERSION: - 76d5f772f70d6915c89da00414c20009b03cc361 From 5393c5df0ec467c41d829ab8cf54b9c72069437a Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 19:59:49 +0200 Subject: [PATCH 13/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index ed0a895..6e3e118 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -1,8 +1,6 @@ when: - - event: push - path: - - 'alertmanager-ntfy/**' - - '.woodpecker/alertmanager-ntfy.yaml' + - path: + include: ['alertmanager-ntfy/**', '.woodpecker/alertmanager-ntfy.yaml'] - event: cron cron: daily From 344872fea9784a4d6bf942259120da49521c6bd3 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:01:14 +0200 Subject: [PATCH 14/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 6e3e118..9bc2665 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -1,8 +1,7 @@ when: - path: include: ['alertmanager-ntfy/**', '.woodpecker/alertmanager-ntfy.yaml'] - - event: cron - cron: daily + - event: [cron] matrix: ALERTMANAGER_NTFY_VERSION: From b3df97dd8952fd20f99eed051e98e5ee7758900b Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:02:09 +0200 Subject: [PATCH 15/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 9bc2665..3b567bc 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -1,8 +1,3 @@ -when: - - path: - include: ['alertmanager-ntfy/**', '.woodpecker/alertmanager-ntfy.yaml'] - - event: [cron] - matrix: ALERTMANAGER_NTFY_VERSION: - 76d5f772f70d6915c89da00414c20009b03cc361 From 1b755639ed8d14ac48bd19ad22a583f491883745 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:03:10 +0200 Subject: [PATCH 16/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 3b567bc..165f970 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -1,9 +1,3 @@ -matrix: - ALERTMANAGER_NTFY_VERSION: - - 76d5f772f70d6915c89da00414c20009b03cc361 - IMAGE_NAME: - - git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy - steps: - name: setup image: alpine @@ -22,3 +16,9 @@ steps: - --destination=${IMAGE_NAME}:${ALERTMANAGER-NTFY_VERSION} - --no-push - --tar-path=/woodpecker/images/alertmanager-ntfy.tar + +matrix: + ALERTMANAGER_NTFY_VERSION: + - 76d5f772f70d6915c89da00414c20009b03cc361 + IMAGE_NAME: + - git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy From b8abef9994319dffa7760fc73a8103fcc7413b97 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:04:52 +0200 Subject: [PATCH 17/29] fix --- alertmanager-ntfy/Containerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/alertmanager-ntfy/Containerfile b/alertmanager-ntfy/Containerfile index 8f45f75..d2a7bdb 100644 --- a/alertmanager-ntfy/Containerfile +++ b/alertmanager-ntfy/Containerfile @@ -1,5 +1,4 @@ -ARG TAG=latest -FROM docker.io/golang:${TAG} as builder +FROM docker.io/golang:latest as builder ARG CGO_ENABLED=0 WORKDIR /app From 62c04cafda8fbd64874e2d21de5793b7d2f14078 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:06:45 +0200 Subject: [PATCH 18/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 165f970..fa6c629 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -4,7 +4,7 @@ steps: commands: - apk -u add git - mkdir /woodpecker/images - - git clone --revision=${ALERTMANAGER_NTFY_VERSION} https://github.com/alexbakker/alertmanager-ntfy.git + - git clone --revision=76d5f772f70d6915c89da00414c20009b03cc361 https://github.com/alexbakker/alertmanager-ntfy.git - ls - name: build-image @@ -13,12 +13,6 @@ steps: - /kaniko/executor - --context=dir:///woodpecker/src/alertmanager-ntfy - --dockerfile=./Containerfile - - --destination=${IMAGE_NAME}:${ALERTMANAGER-NTFY_VERSION} + - --destination=git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy:76d5f772f70d6915c89da00414c20009b03cc361 - --no-push - - --tar-path=/woodpecker/images/alertmanager-ntfy.tar - -matrix: - ALERTMANAGER_NTFY_VERSION: - - 76d5f772f70d6915c89da00414c20009b03cc361 - IMAGE_NAME: - - git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy + - --tar-path=/woodpecker/images/alertmanager-ntfy.tar \ No newline at end of file From 4f01fe18fb7b4561974767d3739caf76e2858326 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:08:04 +0200 Subject: [PATCH 19/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index fa6c629..2181c74 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -1,3 +1,10 @@ +when: + - event: push + path: + - 'alertmanager-ntfy/**' + - '.woodpecker/alertmanager-ntfy.yaml' + - event: cron + steps: - name: setup image: alpine From e6cfbf9d61b64d37ab73d06a7663284c4446f57b Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:09:26 +0200 Subject: [PATCH 20/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 2181c74..801614e 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -11,8 +11,10 @@ steps: commands: - apk -u add git - mkdir /woodpecker/images - - git clone --revision=76d5f772f70d6915c89da00414c20009b03cc361 https://github.com/alexbakker/alertmanager-ntfy.git + - git clone https://github.com/alexbakker/alertmanager-ntfy.git - ls + - cd alertmanager-ntfy + - git checkout 76d5f772f70d6915c89da00414c20009b03cc361 - name: build-image image: gcr.io/kaniko-project/executor From e40d4ee9def6aed7fb0e6461f082edec1ffac903 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:10:29 +0200 Subject: [PATCH 21/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 5 ++--- alertmanager-ntfy/Containerfile | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 801614e..c5cd6b3 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -11,9 +11,8 @@ steps: commands: - apk -u add git - mkdir /woodpecker/images - - git clone https://github.com/alexbakker/alertmanager-ntfy.git - - ls - - cd alertmanager-ntfy + - git clone https://github.com/alexbakker/alertmanager-ntfy.git alertmanager-ntfy/src + - cd alertmanager-ntfy/src - git checkout 76d5f772f70d6915c89da00414c20009b03cc361 - name: build-image diff --git a/alertmanager-ntfy/Containerfile b/alertmanager-ntfy/Containerfile index d2a7bdb..fe508ea 100644 --- a/alertmanager-ntfy/Containerfile +++ b/alertmanager-ntfy/Containerfile @@ -2,9 +2,9 @@ FROM docker.io/golang:latest as builder ARG CGO_ENABLED=0 WORKDIR /app -COPY go.mod go.sum ./ +COPY src/go.mod src/go.sum ./ RUN go mod download -COPY . . +COPY src/. . RUN go build From bd58210fa807fac1026d27f91404e69db463babd Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:12:16 +0200 Subject: [PATCH 22/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index c5cd6b3..30ec4ca 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -9,11 +9,15 @@ steps: - name: setup image: alpine commands: + - ls - apk -u add git - mkdir /woodpecker/images - git clone https://github.com/alexbakker/alertmanager-ntfy.git alertmanager-ntfy/src + - ls - cd alertmanager-ntfy/src - git checkout 76d5f772f70d6915c89da00414c20009b03cc361 + - cd ../.. + - ls - name: build-image image: gcr.io/kaniko-project/executor From 402a268a4a3aca93c8229a33be2bde30f5489f23 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:13:18 +0200 Subject: [PATCH 23/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 30ec4ca..400eafb 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -5,6 +5,9 @@ when: - '.woodpecker/alertmanager-ntfy.yaml' - event: cron +workspace: + path: src + steps: - name: setup image: alpine From e71ed22722cb634cd66bab3d755665d3db7dc948 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:14:15 +0200 Subject: [PATCH 24/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 400eafb..72a2518 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -15,12 +15,7 @@ steps: - ls - apk -u add git - mkdir /woodpecker/images - - git clone https://github.com/alexbakker/alertmanager-ntfy.git alertmanager-ntfy/src - - ls - - cd alertmanager-ntfy/src - - git checkout 76d5f772f70d6915c89da00414c20009b03cc361 - - cd ../.. - - ls + - git clone --revision=76d5f772f70d6915c89da00414c20009b03cc361 https://github.com/alexbakker/alertmanager-ntfy.git alertmanager-ntfy/src - name: build-image image: gcr.io/kaniko-project/executor From 71f008330cd680a9a5049c8ef0d8b91dbc7c6f3a Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:16:05 +0200 Subject: [PATCH 25/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 72a2518..9e1e1e4 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -15,7 +15,8 @@ steps: - ls - apk -u add git - mkdir /woodpecker/images - - git clone --revision=76d5f772f70d6915c89da00414c20009b03cc361 https://github.com/alexbakker/alertmanager-ntfy.git alertmanager-ntfy/src + - git clone https://github.com/alexbakker/alertmanager-ntfy.git alertmanager-ntfy/src + - cd alertmanager-ntfy/src && git checkout 76d5f772f70d6915c89da00414c20009b03cc361 && cd ../.. - name: build-image image: gcr.io/kaniko-project/executor From 141234f9fe95befb59ecc9a95bc623ca9b5c926b Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:17:51 +0200 Subject: [PATCH 26/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 9e1e1e4..05da66a 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -8,6 +8,13 @@ when: workspace: path: src +matrix: + VERSION: + - 76d5f772f70d6915c89da00414c20009b03cc361 + IMAGE_NAME: + - git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy + + steps: - name: setup image: alpine @@ -16,7 +23,7 @@ steps: - apk -u add git - mkdir /woodpecker/images - git clone https://github.com/alexbakker/alertmanager-ntfy.git alertmanager-ntfy/src - - cd alertmanager-ntfy/src && git checkout 76d5f772f70d6915c89da00414c20009b03cc361 && cd ../.. + - cd alertmanager-ntfy/src && git checkout ${VERSION} && cd ../.. - name: build-image image: gcr.io/kaniko-project/executor @@ -24,6 +31,6 @@ steps: - /kaniko/executor - --context=dir:///woodpecker/src/alertmanager-ntfy - --dockerfile=./Containerfile - - --destination=git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy:76d5f772f70d6915c89da00414c20009b03cc361 + - --destination=git.hamburg.ccc.de/ccchh/oci-images/alertmanager-ntfy:${VERSION} - --no-push - --tar-path=/woodpecker/images/alertmanager-ntfy.tar \ No newline at end of file From 0214d3cea4d9ec4bfa06291dd355840a03eda6c3 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:20:07 +0200 Subject: [PATCH 27/29] fix --- alertmanager-ntfy/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alertmanager-ntfy/Containerfile b/alertmanager-ntfy/Containerfile index fe508ea..e1414d3 100644 --- a/alertmanager-ntfy/Containerfile +++ b/alertmanager-ntfy/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/golang:latest as builder +FROM docker.io/library/golang:1 as builder ARG CGO_ENABLED=0 WORKDIR /app From 1e5b433b3e790e81e467d94c0c2b6363f585eea3 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:26:09 +0200 Subject: [PATCH 28/29] fix --- .woodpecker/alertmanager-ntfy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/alertmanager-ntfy.yaml b/.woodpecker/alertmanager-ntfy.yaml index 05da66a..e424ecd 100644 --- a/.woodpecker/alertmanager-ntfy.yaml +++ b/.woodpecker/alertmanager-ntfy.yaml @@ -23,7 +23,7 @@ steps: - apk -u add git - mkdir /woodpecker/images - git clone https://github.com/alexbakker/alertmanager-ntfy.git alertmanager-ntfy/src - - cd alertmanager-ntfy/src && git checkout ${VERSION} && cd ../.. + - cd alertmanager-ntfy/src && git checkout ${VERSION} && cd .. - name: build-image image: gcr.io/kaniko-project/executor From 1750b25d43e621a865b8fb86b8f6404799dbc9c7 Mon Sep 17 00:00:00 2001 From: c6ristian Date: Mon, 2 Jun 2025 20:28:48 +0200 Subject: [PATCH 29/29] fix --- alertmanager-ntfy/Containerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/alertmanager-ntfy/Containerfile b/alertmanager-ntfy/Containerfile index e1414d3..1e14244 100644 --- a/alertmanager-ntfy/Containerfile +++ b/alertmanager-ntfy/Containerfile @@ -1,13 +1,11 @@ FROM docker.io/library/golang:1 as builder ARG CGO_ENABLED=0 -WORKDIR /app +WORKDIR /usr/src/app COPY src/go.mod src/go.sum ./ RUN go mod download COPY src/. . -RUN go build +RUN go build -v -o /usr/local/bin/app ./... -FROM scratch -COPY --from=builder /app/alertmanager-ntfy /alertmanager-ntfy -ENTRYPOINT ["/alertmanager-ntfy"] \ No newline at end of file +CMD ["app"] \ No newline at end of file