.woodpecker.yml

@@ -7,7 +7,7 @@ variables:
     - CONTEXT=.
     - MATRIX_HOST=matrix.balsillie.net
     - MATRIX_PORT=443
-    - MATRIX_ROOM=!BQyqVopHitLowtucMg:balsillie.net
+    - MATRIX_ROOM=!HdSXmuHcBMaYExEfkh:balsillie.net
 
 workspace:
   base: /git
@@ -21,9 +21,10 @@ pipeline:
 
   docker-build:
     image: docker:latest
+    when:
+      - event: tag
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /etc/localtime:/etc/localtime:ro
     environment:
       *vars
     secrets: 
@@ -40,13 +41,13 @@ pipeline:
         -f $${DOCKERFILE}
         $${CONTEXT}
       - docker push -a $REGISTRY/$${CI_REPO}
-    when:
-      event: tag
-      tag: v*
 
   notify-matrix-success:
     image: code.balsillie.net/containers/woodpecker-util
     pull: false
+    when:
+      - event: tag
+        status: [ success ]
     environment:
       *vars
     secrets:
@@ -54,14 +55,15 @@ pipeline:
         target: MATRIX_ACCESS_TOKEN
     commands:
       - shoutrrr send 
-        --url matrix://:$${MATRIX_ACCESS_TOKEN}@$${MATRIX_HOST}:$${MATRIX_PORT}/?rooms=$${MATRIX_ROOM}
+        --url matrix://$${MATRIX_ACCESS_TOKEN}@$${MATRIX_HOST}:$${MATRIX_PORT}/?rooms=$${MATRIX_ROOM}
         --message "New image build of $${CI_REPO}, $${CI_COMMIT_TAG}, has been completed and pushed."
-    when:
-      status: [ success ]
 
   notify-matrix-failure:
     image: code.balsillie.net/containers/woodpecker-util
     pull: false
+    when:
+      - event: tag
+        status: [ failure ]
     environment:
       *vars
     secrets:
@@ -71,5 +73,3 @@ pipeline:
       - shoutrrr send 
         --url matrix://$${MATRIX_ACCESS_TOKEN}@$${MATRIX_HOST}:$${MATRIX_PORT}/?rooms=$${MATRIX_ROOM}
         --message "New image build of $${CI_REPO}, $${CI_COMMIT_TAG}, has failed."
-    when:
-      status: [ failure ]

Dockerfile

@@ -1,21 +1,17 @@
 ARG SHOUTRRR_VERSION=v0.6.1
 FROM golang:bullseye AS builder
-ARG SHOUTRRR_VERSION
-RUN git clone -b ${SHOUTRRR_VERSION} --depth 1 https://github.com/containrrr/shoutrrr.git ./shoutrrr
-RUN cd ./shoutrrr && \
-    mkdir /output && \
+RUN git clone https://github.com/containrrr/shoutrrr.git shoutrrr \
+    cd ./shoutrrr \
+    git checkout ${SHOUTRRR_VERSION} \
     go build -o /output ./shoutrrr
 
 FROM debian:11-slim
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 RUN apt-get update && \
-    apt-get -y --no-install-recommends install \
-      bash \
-      curl \ 
-      jq \
-      ca-certificates && \
+    apt-get install -y bash curl jq ca-certificates && \
     rm -rf /var/lib/apt/lists/*
+
 RUN ln -sf /bin/bash /bin/sh
 WORKDIR /root
-COPY --from=builder /output/shoutrrr /usr/bin/shoutrrr
-RUN chmod +x /usr/bin/shoutrrr
+COPY --from=builder /output ./shoutrrr
+RUN chmod +x /root/shoutrrr/shoutrrr && \
+    ln -sf /root/shoutrrr/shoutrrr /usr/bin/shoutrrr