From ed9e013135ec62716491ff16ebf3bffa9bfcdef6 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 1 Mar 2022 18:33:23 -0300
Subject: [PATCH 01/19] knot is always at knot.doma.in

---
 nsupdate.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nsupdate.sh b/nsupdate.sh
index 5fe991f..eeab470 100755
--- a/nsupdate.sh
+++ b/nsupdate.sh
@@ -3,10 +3,9 @@
 # Registers the local IPv6 address to the DNS
 
 IP6="`whatsmyip6`"
-KNOT="${KNOT:-${IP6}}"
+KNOT="${KNOT:-knot.${DOMAIN}}"
 
 test -z "${IP6}" && exit 1
-test -z "${KNOT}" && exit 1
 test -z "${DOMAIN}" && exit 1
 
 # Add a dot if the hostname contains the domain

From 0c9ca5f55b4e47d66da96b644309a96a3f57b1aa Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 2 Mar 2022 13:29:02 -0300
Subject: [PATCH 02/19] don't cleanup after build

should allow woodpecker to reutilize the cache
---
 .woodpecker.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 9390f52..419e59e 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -13,6 +13,8 @@ pipeline:
     secrets:
     - docker_password
     cache_from: registry.nulo.in/sutty/monit:${ALPINE_VERSION}
+    docker:
+      purge: false
     when:
       branch: antifascista
       event: push

From 9a9ee411dab834014d945523cf397375c9d059ef Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 3 Mar 2022 22:59:09 -0300
Subject: [PATCH 03/19] alpine versions

---
 .woodpecker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 103cb72..ceb5737 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -15,8 +15,8 @@ pipeline:
     when:
       branch: antifascista
       event: push
-
 matrix:
   ALPINE_VERSION:
-  - 3.13.6
-  - 3.14.2
+  - 3.13.7
+  - 3.14.3
+  - 3.15.0

From 755c3c75d6bfbca4f534b43c7a8a3b6220bf0b90 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 7 Mar 2022 18:59:28 -0300
Subject: [PATCH 04/19] configurable email

---
 .woodpecker.yml | 5 ++++-
 Dockerfile      | 5 ++++-
 monitrc         | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 419e59e..5b41c20 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,11 +7,14 @@ pipeline:
     - ${ALPINE_VERSION}
     - latest
     build_args:
+    - EMAIL=${MONIT_EMAIL}
+    - EMAIL_FROM=${MONIT_EMAIL_FROM}
     - ALPINE_VERSION=${ALPINE_VERSION}
     - BASE_IMAGE=alpine
     username: sutty
     secrets:
-    - docker_password
+    - DOCKER_PASSWORD
+    - MONIT_EMAIL
     cache_from: registry.nulo.in/sutty/monit:${ALPINE_VERSION}
     docker:
       purge: false
diff --git a/Dockerfile b/Dockerfile
index dc02004..2bec62a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,17 @@
 ARG ALPINE_VERSION=3.13.6
 ARG BASE_IMAGE=alpine
 ARG EMAIL=monit@sutty.nl
+ARG EMAIL_FROM=monit@sutty.nl
 FROM ${BASE_IMAGE}:${ALPINE_VERSION} as build
-ENV EMAIL ${EMAIL:-monit@sutty.nl}
+ARG EMAIL
+ARG EMAIL_FROM
 
 RUN apk add --no-cache tzdata
 
 COPY ./monitrc /etc/monitrc
 RUN chmod 600 /etc/monitrc
 RUN sed -re "s/@@EMAIL@@/${EMAIL}/" -i /etc/monitrc
+RUN sed -re "s/@@EMAIL_FROM@@/${EMAIL_FROM}/" -i /etc/monitrc
 
 FROM ${BASE_IMAGE}:${ALPINE_VERSION}
 ARG ALPINE_VERSION
diff --git a/monitrc b/monitrc
index 80a42f4..2408173 100644
--- a/monitrc
+++ b/monitrc
@@ -18,4 +18,10 @@ check program nsupdate
   every 1 cycle
   if status = 0 then unmonitor
 
+set mail-format {
+  from: Monit <@@EMAIL_FROM@@>
+  subject: $SERVICE@$HOST
+  message: $ACTION $SERVICE -- $DATE -- $HOST: $DESCRIPTION.
+}
+
 include /etc/monit.d/*.conf

From d27b839b0dd2fe39fb6bd7411bf67306e67627cf Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 7 Mar 2022 19:55:25 -0300
Subject: [PATCH 05/19] verify config

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 2bec62a..79b81fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ COPY ./monitrc /etc/monitrc
 RUN chmod 600 /etc/monitrc
 RUN sed -re "s/@@EMAIL@@/${EMAIL}/" -i /etc/monitrc
 RUN sed -re "s/@@EMAIL_FROM@@/${EMAIL_FROM}/" -i /etc/monitrc
+RUN monit -t
 
 FROM ${BASE_IMAGE}:${ALPINE_VERSION}
 ARG ALPINE_VERSION

From 7aa9fe6d10aa0a8bce287aa1ae5bfe7bfd7967e2 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 7 Mar 2022 19:59:50 -0300
Subject: [PATCH 06/19] fixes

---
 .woodpecker.yml | 5 +++--
 Dockerfile      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 5b41c20..a59b24a 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -13,8 +13,9 @@ pipeline:
     - BASE_IMAGE=alpine
     username: sutty
     secrets:
-    - DOCKER_PASSWORD
-    - MONIT_EMAIL
+    - docker_password
+    - monit_email
+    - monit_email_from
     cache_from: registry.nulo.in/sutty/monit:${ALPINE_VERSION}
     docker:
       purge: false
diff --git a/Dockerfile b/Dockerfile
index 79b81fd..e4135f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ FROM ${BASE_IMAGE}:${ALPINE_VERSION} as build
 ARG EMAIL
 ARG EMAIL_FROM
 
-RUN apk add --no-cache tzdata
+RUN apk add --no-cache tzdata monit
 
 COPY ./monitrc /etc/monitrc
 RUN chmod 600 /etc/monitrc

From b04c169a8e42e41f7a66c6649240cae2261e6751 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 7 Mar 2022 20:28:42 -0300
Subject: [PATCH 07/19] autoconfigure email

---
 .woodpecker.yml |  4 ----
 Dockerfile      |  7 +++----
 email.conf      |  9 +++++++++
 email.sh        | 15 +++++++++++++++
 monitrc         | 12 +++++-------
 5 files changed, 32 insertions(+), 15 deletions(-)
 create mode 100644 email.conf
 create mode 100755 email.sh

diff --git a/.woodpecker.yml b/.woodpecker.yml
index a59b24a..5544db3 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -8,14 +8,10 @@ pipeline:
     - latest
     build_args:
     - EMAIL=${MONIT_EMAIL}
-    - EMAIL_FROM=${MONIT_EMAIL_FROM}
-    - ALPINE_VERSION=${ALPINE_VERSION}
     - BASE_IMAGE=alpine
     username: sutty
     secrets:
     - docker_password
-    - monit_email
-    - monit_email_from
     cache_from: registry.nulo.in/sutty/monit:${ALPINE_VERSION}
     docker:
       purge: false
diff --git a/Dockerfile b/Dockerfile
index e4135f9..bf34f7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,13 +6,10 @@ FROM ${BASE_IMAGE}:${ALPINE_VERSION} as build
 ARG EMAIL
 ARG EMAIL_FROM
 
-RUN apk add --no-cache tzdata monit
+RUN apk add --no-cache tzdata
 
 COPY ./monitrc /etc/monitrc
 RUN chmod 600 /etc/monitrc
-RUN sed -re "s/@@EMAIL@@/${EMAIL}/" -i /etc/monitrc
-RUN sed -re "s/@@EMAIL_FROM@@/${EMAIL_FROM}/" -i /etc/monitrc
-RUN monit -t
 
 FROM ${BASE_IMAGE}:${ALPINE_VERSION}
 ARG ALPINE_VERSION
@@ -37,6 +34,8 @@ RUN install -dm 2750 -o root -g root /var/lib/monit
 COPY --from=build /etc/monitrc /etc/monitrc
 COPY ./nsupdate.sh /usr/local/bin/nsupdate
 COPY ./whatsmyip6.sh /usr/local/bin/whatsmyip6
+COPY ./email.sh /usr/local/bin/email
+COPY ./email.conf /etc/email.conf
 
 # Allow access to the web GUI
 EXPOSE 2812
diff --git a/email.conf b/email.conf
new file mode 100644
index 0000000..d5868eb
--- /dev/null
+++ b/email.conf
@@ -0,0 +1,9 @@
+set mailserver postfix port 25 using hostname @@HOSTNAME@@
+
+set alert @@EMAIL@@
+
+set mail-format {
+  from: Monit <@@EMAIL_FROM@@>
+  subject: $SERVICE@$HOST
+  message: $ACTION $SERVICE -- $DATE -- $HOST: $DESCRIPTION.
+}
diff --git a/email.sh b/email.sh
new file mode 100755
index 0000000..288376b
--- /dev/null
+++ b/email.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+test ! -f /etc/monit.d/email.conf || exit 0
+
+test -n "${EMAIL}"
+test -n "${EMAIL_FROM}"
+
+sed -re "s/@@EMAIL@@/${EMAIL}/" \
+     -e "s/@@EMAIL_FROM@@/${EMAIL_FROM}/" \
+     -e "s/@@HOSTNAME@@/${EMAIL_FROM#*@}/" \
+     /etc/email.conf > /etc/monit.d/email.conf
+
+monit -t
+monit reload
diff --git a/monitrc b/monitrc
index 2408173..6129533 100644
--- a/monitrc
+++ b/monitrc
@@ -5,23 +5,21 @@ set pidfile /run/monit.pid
 set idfile /var/lib/monit/id
 set statefile /var/lib/monit/state
 set eventqueue basedir /var/lib/monit/events slots 100
-set mailserver postfix
 set limits { programoutput: 1 MB }
-set alert @@EMAIL@@
 
 set httpd port 2812
   allow localhost
   allow 172.0.0.0/8
+  allow "fd00:acab::/32"
 
 check program nsupdate
   with path "/usr/local/bin/nsupdate"
   every 1 cycle
   if status = 0 then unmonitor
 
-set mail-format {
-  from: Monit <@@EMAIL_FROM@@>
-  subject: $SERVICE@$HOST
-  message: $ACTION $SERVICE -- $DATE -- $HOST: $DESCRIPTION.
-}
+check program email
+  with path "/usr/local/bin/email"
+  every 1 cycle
+  if status = 0 then unmonitor
 
 include /etc/monit.d/*.conf

From a299ab663ff96bd4e706ba51be62d7f5c2585439 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 8 Mar 2022 09:43:09 -0300
Subject: [PATCH 08/19] newer versions first

---
 .woodpecker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index ceb5737..6ba53d3 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -17,6 +17,6 @@ pipeline:
       event: push
 matrix:
   ALPINE_VERSION:
-  - 3.13.7
-  - 3.14.3
   - 3.15.0
+  - 3.14.3
+  - 3.13.7

From 43875349448a9286a25fabb0deb6045fb76d0ac0 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sun, 13 Mar 2022 23:27:39 -0300
Subject: [PATCH 09/19] mmonit support

---
 Dockerfile                  | 4 ++--
 monitrc                     | 4 ++--
 email.conf => zeroconf.conf | 1 +
 email.sh => zeroconf.sh     | 6 ++++--
 4 files changed, 9 insertions(+), 6 deletions(-)
 rename email.conf => zeroconf.conf (84%)
 rename email.sh => zeroconf.sh (57%)

diff --git a/Dockerfile b/Dockerfile
index bf34f7a..4032b87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,8 +34,8 @@ RUN install -dm 2750 -o root -g root /var/lib/monit
 COPY --from=build /etc/monitrc /etc/monitrc
 COPY ./nsupdate.sh /usr/local/bin/nsupdate
 COPY ./whatsmyip6.sh /usr/local/bin/whatsmyip6
-COPY ./email.sh /usr/local/bin/email
-COPY ./email.conf /etc/email.conf
+COPY ./zeroconf.sh /usr/local/bin/zeroconf
+COPY ./zeroconf.conf /etc/zeroconf.conf
 
 # Allow access to the web GUI
 EXPOSE 2812
diff --git a/monitrc b/monitrc
index 6129533..a51e485 100644
--- a/monitrc
+++ b/monitrc
@@ -17,8 +17,8 @@ check program nsupdate
   every 1 cycle
   if status = 0 then unmonitor
 
-check program email
-  with path "/usr/local/bin/email"
+check program zeroconf
+  with path "/usr/local/bin/zeroconf"
   every 1 cycle
   if status = 0 then unmonitor
 
diff --git a/email.conf b/zeroconf.conf
similarity index 84%
rename from email.conf
rename to zeroconf.conf
index d5868eb..a667bec 100644
--- a/email.conf
+++ b/zeroconf.conf
@@ -1,3 +1,4 @@
+set mmonit http://@@MMONIT@@/collector
 set mailserver postfix port 25 using hostname @@HOSTNAME@@
 
 set alert @@EMAIL@@
diff --git a/email.sh b/zeroconf.sh
similarity index 57%
rename from email.sh
rename to zeroconf.sh
index 288376b..6652aaf 100755
--- a/email.sh
+++ b/zeroconf.sh
@@ -1,15 +1,17 @@
 #!/bin/sh
 set -e
 
-test ! -f /etc/monit.d/email.conf || exit 0
+test ! -f /etc/monit.d/zeroconf.conf || exit 0
 
 test -n "${EMAIL}"
 test -n "${EMAIL_FROM}"
+test -n "${MMONIT}"
 
 sed -re "s/@@EMAIL@@/${EMAIL}/" \
      -e "s/@@EMAIL_FROM@@/${EMAIL_FROM}/" \
      -e "s/@@HOSTNAME@@/${EMAIL_FROM#*@}/" \
-     /etc/email.conf > /etc/monit.d/email.conf
+     -e "s/@@MMONIT@@/${MMONIT}/" \
+     /etc/zeroconf.conf > /etc/monit.d/zeroconf.conf
 
 monit -t
 monit reload

From c0531c8f3c218c46288b235e4d000a7ed8a5e59e Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 14 Mar 2022 11:09:55 -0300
Subject: [PATCH 10/19] bug introduced by
 b04c169a8e42e41f7a66c6649240cae2261e6751

---
 .woodpecker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 5544db3..cece0e4 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -8,6 +8,7 @@ pipeline:
     - latest
     build_args:
     - EMAIL=${MONIT_EMAIL}
+    - ALPINE_VERSION=${ALPINE_VERSION}
     - BASE_IMAGE=alpine
     username: sutty
     secrets:

From a615fdf509a4c9f890d96e9e846ce1f201e5abc7 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 14 Mar 2022 11:10:22 -0300
Subject: [PATCH 11/19] default env

---
 Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4032b87..2871165 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,6 @@
 ARG ALPINE_VERSION=3.13.6
 ARG BASE_IMAGE=alpine
-ARG EMAIL=monit@sutty.nl
-ARG EMAIL_FROM=monit@sutty.nl
 FROM ${BASE_IMAGE}:${ALPINE_VERSION} as build
-ARG EMAIL
-ARG EMAIL_FROM
 
 RUN apk add --no-cache tzdata
 
@@ -14,6 +10,9 @@ RUN chmod 600 /etc/monitrc
 FROM ${BASE_IMAGE}:${ALPINE_VERSION}
 ARG ALPINE_VERSION
 MAINTAINER "f <f@sutty.nl>"
+ENV EMAIL=monit@sutty.nl
+ENV EMAIL_FROM=monit@sutty.nl
+ENV MMONIT=mmmonit.athshe.sutty.nl
 
 # Locale
 ENV LANG="C.UTF-8"

From d4294d219a484cf771a94029922f58efcbb237ac Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 14 Mar 2022 18:34:00 -0300
Subject: [PATCH 12/19] register to mmmonit with credentials

---
 monitrc       | 5 -----
 zeroconf.conf | 6 ++++++
 zeroconf.sh   | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/monitrc b/monitrc
index a51e485..40585f6 100644
--- a/monitrc
+++ b/monitrc
@@ -7,11 +7,6 @@ set statefile /var/lib/monit/state
 set eventqueue basedir /var/lib/monit/events slots 100
 set limits { programoutput: 1 MB }
 
-set httpd port 2812
-  allow localhost
-  allow 172.0.0.0/8
-  allow "fd00:acab::/32"
-
 check program nsupdate
   with path "/usr/local/bin/nsupdate"
   every 1 cycle
diff --git a/zeroconf.conf b/zeroconf.conf
index a667bec..796147b 100644
--- a/zeroconf.conf
+++ b/zeroconf.conf
@@ -8,3 +8,9 @@ set mail-format {
   subject: $SERVICE@$HOST
   message: $ACTION $SERVICE -- $DATE -- $HOST: $DESCRIPTION.
 }
+
+set httpd port 2812
+  allow localhost
+  allow 172.0.0.0/8
+  allow "fd00:acab::/32"
+  allow @@CREDENTIALS@@
diff --git a/zeroconf.sh b/zeroconf.sh
index 6652aaf..79b64f3 100755
--- a/zeroconf.sh
+++ b/zeroconf.sh
@@ -6,11 +6,13 @@ test ! -f /etc/monit.d/zeroconf.conf || exit 0
 test -n "${EMAIL}"
 test -n "${EMAIL_FROM}"
 test -n "${MMONIT}"
+test -n "${CREDENTIALS}"
 
 sed -re "s/@@EMAIL@@/${EMAIL}/" \
      -e "s/@@EMAIL_FROM@@/${EMAIL_FROM}/" \
      -e "s/@@HOSTNAME@@/${EMAIL_FROM#*@}/" \
      -e "s/@@MMONIT@@/${MMONIT}/" \
+     -e "s/@@CREDENTIALS@@/${CREDENTIALS}/" \
      /etc/zeroconf.conf > /etc/monit.d/zeroconf.conf
 
 monit -t

From 8b674a10b94cb493e763bc9ceb678be7033bca7f Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 14 Mar 2022 18:34:42 -0300
Subject: [PATCH 13/19] we'll skip this version

---
 .woodpecker.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index cece0e4..7b72937 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -22,6 +22,5 @@ pipeline:
 matrix:
   ALPINE_VERSION:
   - 3.13.6
-  - 3.13.7
   - 3.14.3
   - 3.15.0

From 03513b78ec812698f025e2d6d2e1be032c5dad4d Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 15 Mar 2022 18:05:28 -0300
Subject: [PATCH 14/19] less data

---
 zeroconf.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zeroconf.conf b/zeroconf.conf
index 796147b..6ecefda 100644
--- a/zeroconf.conf
+++ b/zeroconf.conf
@@ -5,8 +5,8 @@ set alert @@EMAIL@@
 
 set mail-format {
   from: Monit <@@EMAIL_FROM@@>
-  subject: $SERVICE@$HOST
-  message: $ACTION $SERVICE -- $DATE -- $HOST: $DESCRIPTION.
+  subject: $HOST
+  message: $ACTION $SERVICE -- $DATE: $DESCRIPTION.
 }
 
 set httpd port 2812

From 65304feb568ba58bbfc43eea2b6cc5e0afe1c5a5 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 19 Mar 2022 14:46:16 -0300
Subject: [PATCH 15/19] alpine upgrade

---
 .woodpecker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 6ba53d3..49b2345 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -17,6 +17,6 @@ pipeline:
       event: push
 matrix:
   ALPINE_VERSION:
-  - 3.15.0
-  - 3.14.3
-  - 3.13.7
+  - 3.15.1
+  - 3.14.4
+  - 3.13.8

From 1b72fdc8b012a234bfa07f0fc39a11654938737b Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 19 Mar 2022 14:47:05 -0300
Subject: [PATCH 16/19] credentials for mmmonit

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 2871165..dbcab97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ MAINTAINER "f <f@sutty.nl>"
 ENV EMAIL=monit@sutty.nl
 ENV EMAIL_FROM=monit@sutty.nl
 ENV MMONIT=mmmonit.athshe.sutty.nl
+ENV CREDENTIALS=mmmonit:mmmonit.athshe.sutty.nl
 
 # Locale
 ENV LANG="C.UTF-8"

From e565c1380a36155372a8d0f04754f7f24c5ed0cd Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 19 Mar 2022 14:48:54 -0300
Subject: [PATCH 17/19] woodpecker-cli lint

---
 .woodpecker.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 49b2345..983fbd7 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,15 +1,16 @@
 pipeline:
   publish:
     image: plugins/docker
-    registry: registry.nulo.in
-    repo: registry.nulo.in/sutty/CHANGEME
-    tags:
-    - ${ALPINE_VERSION}
-    - latest
-    build_args:
-    - ALPINE_VERSION=${ALPINE_VERSION}
-    - BASE_IMAGE=registry.nulo.in/sutty/monit
-    username: sutty
+    settings:
+      registry: registry.nulo.in
+      username: sutty
+      repo: registry.nulo.in/sutty/CHANGEME
+      tags:
+      - ${ALPINE_VERSION}
+      - latest
+      build_args:
+      - ALPINE_VERSION=${ALPINE_VERSION}
+      - BASE_IMAGE=registry.nulo.in/sutty/monit
     secrets:
     - docker_password
     when:

From deaa49652f51228ffd8a692ab09aaa73894a32d0 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 28 Mar 2022 19:06:57 -0300
Subject: [PATCH 18/19] alpine releases

https://alpinelinux.org/posts/Alpine-3.12.11-3.13.9-3.14.5-3.15.3-released.html
---
 .woodpecker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 983fbd7..3214031 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -18,6 +18,6 @@ pipeline:
       event: push
 matrix:
   ALPINE_VERSION:
-  - 3.15.1
-  - 3.14.4
-  - 3.13.8
+  - 3.15.3
+  - 3.14.5
+  - 3.13.9

From e41a77ee7bb8192fd2a574ebe5650f8fa1045852 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 29 Mar 2022 10:15:29 -0300
Subject: [PATCH 19/19] cache prevents build if the version doesn't exist

---
 .woodpecker.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index db96feb..a452dd5 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,7 +11,6 @@ pipeline:
       build_args:
       - ALPINE_VERSION=${ALPINE_VERSION}
       - BASE_IMAGE=alpine
-      cache_from: registry.nulo.in/sutty/monit:${ALPINE_VERSION}
       purge: false
     secrets:
     - docker_password