Merge branch 'antifascista' of ssh://gitea.nulo.in:420/Sutty/containers-skel into antifascista

.woodpecker.yml

@@ -1,26 +1,25 @@
 pipeline:
   publish:
     image: plugins/docker
+    settings:
       registry: registry.nulo.in
+      username: sutty
       repo: registry.nulo.in/sutty/monit
       tags:
       - ${ALPINE_VERSION}
       - latest
       build_args:
-    - EMAIL=${MONIT_EMAIL}
       - ALPINE_VERSION=${ALPINE_VERSION}
       - BASE_IMAGE=alpine
-    username: sutty
+      cache_from: registry.nulo.in/sutty/monit:${ALPINE_VERSION}
+      purge: false
     secrets:
     - docker_password
-    cache_from: registry.nulo.in/sutty/monit:${ALPINE_VERSION}
-    docker:
-      purge: false
     when:
       branch: antifascista
       event: push
 matrix:
   ALPINE_VERSION:
-  - 3.13.6
-  - 3.14.3
-  - 3.15.0
+  - 3.15.1
+  - 3.14.4
+  - 3.13.8

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"