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

.woodpecker.yml

@@ -1,17 +1,18 @@
 pipeline:
   publish:
     image: plugins/docker
-    registry: registry.nulo.in
+    settings:
-    repo: registry.nulo.in/sutty/nginx
+      registry: registry.nulo.in
-    tags:
+      username: sutty
-    - ${ALPINE_VERSION}
+      repo: registry.nulo.in/sutty/nginx
-    - latest
+      tags:
-    build_args:
+      - ${ALPINE_VERSION}
-    - ALPINE_VERSION=${ALPINE_VERSION}
+      - latest
-    - BASE_IMAGE=registry.nulo.in/sutty/monit
+      build_args:
-    - GEOIP2_DATABASE=https://archive.archlinux.org/packages/g/geoip2-database/geoip2-database-20191203-1-any.pkg.tar.xz
+      - ALPINE_VERSION=${ALPINE_VERSION}
-    - CRAWLERS=https://raw.githubusercontent.com/monperrus/crawler-user-agents/master/crawler-user-agents.json
+      - BASE_IMAGE=registry.nulo.in/sutty/monit
-    username: sutty
+      - GEOIP2_DATABASE=https://archive.archlinux.org/packages/g/geoip2-database/geoip2-database-20191203-1-any.pkg.tar.xz
+      - CRAWLERS=https://raw.githubusercontent.com/monperrus/crawler-user-agents/master/crawler-user-agents.json
     secrets:
     - docker_password
     when:
@@ -19,6 +20,7 @@ pipeline:
       event: push
 matrix:
   ALPINE_VERSION:
-  - 3.13.7
+  - 3.16.2
-  - 3.14.3
+  - 3.15.6
-  - 3.15.0
+  - 3.14.8
+  - 3.13.12