Merge pull request 'chore(deps): update docker.io/plugins/docker docker tag to v20.17.2' (#31) from renovate/docker.io-plugins-docker-20.x into master

This reverts commit 5ffaeaf154.

.drone.yml

@@ -3,14 +3,20 @@ kind: pipeline
 type: kubernetes
 name: linter
 
+clone:
+  disable: true
+
 platform:
   os: linux
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.33.0
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.38.0
   resources:
     limits:
       cpu: 150
@@ -28,7 +34,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
       cpu: 150
@@ -48,24 +54,38 @@ kind: pipeline
 type: docker
 name: dry-run-amd64
 
+clone:
+  disable: true
+
+depends_on:
+- linter
+
 platform:
   os: linux
   arch: amd64
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: build
-  image: docker.io/plugins/docker:latest
+  image: docker.io/plugins/docker:20.17.2
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
+    dockerfile: Dockerfile
     dry_run: true
+    force_tag: true
+    no_cache: true
+    purge: true
+    mirror:
+      from_secret: docker_io_mirror
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/postfixadmin
     tags: latest-amd64
-    repo: volkerraschek/markdownlint
     username:
-      from_secret: container_image_registry_user
+      from_secret: git_cryptic_systems_container_registry_user
     password:
-      from_secret: container_image_registry_password
+      from_secret: git_cryptic_systems_container_registry_password
-    no_cache: true
 
 - name: email-notification
   environment:
@@ -79,70 +99,12 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
     - failure
 
-depends_on:
-- linter
-
-trigger:
-  branch:
-    exclude:
-    - master
-  event:
-  - pull_request
-  - push
-  repo:
-  - volker.raschek/postfixadmin-docker
-
----
-kind: pipeline
-type: docker
-name: dry-run-arm-v7
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build
-  image: docker.io/plugins/docker:latest
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: false
-    dry_run: true
-    tags: latest-arm-v7
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    no_cache: true
-
-- name: email-notification
-  environment:
-    SMTP_FROM_ADDRESS:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
-      from_secret: smtp_host
-    SMTP_USERNAME:
-      from_secret: smtp_username
-    SMTP_PASSWORD:
-      from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
-  when:
-    status:
-    - changed
-    - failure
-
-depends_on:
-- linter
-
 trigger:
   branch:
     exclude:
@@ -158,24 +120,38 @@ kind: pipeline
 type: docker
 name: dry-run-arm64-v8
 
+clone:
+  disable: true
+
+depends_on:
+- linter
+
 platform:
   os: linux
   arch: arm64
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: build
-  image: docker.io/plugins/docker:latest
+  image: docker.io/plugins/docker:20.17.2
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
+    dockerfile: Dockerfile
     dry_run: true
-    tags: latest-arm64-v8
+    force_tag: true
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
     no_cache: true
+    purge: true
+    mirror:
+      from_secret: docker_io_mirror
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/postfixadmin
+    tags: latest-arm64-v8
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
 
 - name: email-notification
   environment:
@@ -189,15 +165,12 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
     - failure
 
-depends_on:
-- linter
-
 trigger:
   branch:
     exclude:
@@ -213,23 +186,37 @@ kind: pipeline
 type: docker
 name: latest-amd64
 
+clone:
+  disable: true
+
+depends_on:
+- linter
+
 platform:
   os: linux
   arch: amd64
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: build
-  image: docker.io/plugins/docker:latest
+  image: docker.io/plugins/docker:20.17.2
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
+    dockerfile: Dockerfile
+    force_tag: true
+    no_cache: true
+    purge: true
+    mirror:
+      from_secret: docker_io_mirror
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/postfixadmin
     tags: latest-amd64
-    repo: volkerraschek/postfixadmin
     username:
-      from_secret: container_image_registry_user
+      from_secret: git_cryptic_systems_container_registry_user
     password:
-      from_secret: container_image_registry_password
+      from_secret: git_cryptic_systems_container_registry_password
-    no_cache: true
 
 - name: email-notification
   environment:
@@ -243,68 +230,12 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
     - failure
 
-depends_on:
-- linter
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/postfixadmin-docker
-
----
-kind: pipeline
-type: docker
-name: latest-arm-v7
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build
-  image: docker.io/plugins/docker:latest
-  settings:
-    dockerfile: Dockerfile
-    auto_tag: false
-    tags: latest-arm-v7
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    no_cache: true
-
-- name: email-notification
-  environment:
-    SMTP_FROM_ADDRESS:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
-      from_secret: smtp_host
-    SMTP_USERNAME:
-      from_secret: smtp_username
-    SMTP_PASSWORD:
-      from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
-  when:
-    status:
-    - changed
-    - failure
-
-depends_on:
-- linter
-
 trigger:
   branch:
   - master
@@ -319,23 +250,37 @@ kind: pipeline
 type: docker
 name: latest-arm64-v8
 
+clone:
+  disable: true
+
+depends_on:
+- linter
+
 platform:
   os: linux
   arch: arm64
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: build
-  image: docker.io/plugins/docker:latest
+  image: docker.io/plugins/docker:20.17.2
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
-    tags: latest-arm64-v8
+    dockerfile: Dockerfile
-    repo: volkerraschek/postfixadmin
+    force_tag: true
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
     no_cache: true
+    purge: true
+    mirror:
+      from_secret: docker_io_mirror
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/postfixadmin
+    tags: latest-arm64-v8
+    username:
+      from_secret: git_cryptic_systems_container_registry_user
+    password:
+      from_secret: git_cryptic_systems_container_registry_password
 
 - name: email-notification
   environment:
@@ -349,15 +294,12 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
     - failure
 
-depends_on:
-- linter
-
 trigger:
   branch:
   - master
@@ -372,17 +314,32 @@ kind: pipeline
 type: kubernetes
 name: latest-manifest
 
+clone:
+  disable: true
+
+depends_on:
+- latest-amd64
+- latest-arm64-v8
+
+# docker.io/plugins/manifest only for amd64 architectures available
+node_selector:
+  kubernetes.io/os: linux
+  kubernetes.io/arch: amd64
+
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: build-manifest
-  image: docker.io/plugins/manifest:latest
+  image: docker.io/plugins/manifest:1.4.0
   settings:
     auto_tag: false
     ignore_missing: true
     spec: manifest.tmpl
     username:
-      from_secret: container_image_registry_user
+      from_secret: git_cryptic_systems_container_registry_user
     password:
-      from_secret: container_image_registry_password
+      from_secret: git_cryptic_systems_container_registry_password
 
 - name: email-notification
   environment:
@@ -396,7 +353,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
       cpu: 150
@@ -406,10 +363,65 @@ steps:
     - changed
     - failure
 
+trigger:
+  branch:
+  - master
+  event:
+  - cron
+  - push
+  repo:
+  - volker.raschek/postfixadmin-docker
+
+---
+kind: pipeline
+type: kubernetes
+name: latest-sync
+
+clone:
+  disable: true
+
 depends_on:
-- latest-amd64
+- latest-manifest
-- latest-arm-v7
+
-- latest-arm64-v8
+steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
+- name: latest-sync
+  commands:
+  - skopeo sync --all --src=docker --src-creds=$SRC_CRED_USERNAME:$SRC_CRED_PASSWORD --dest=docker --dest-creds=$DEST_CRED_USERNAME:$DEST_CRED_PASSWORD git.cryptic.systems/volker.raschek/postfixadmin docker.io/volkerraschek
+  environment:
+    SRC_CRED_USERNAME:
+      from_secret: git_cryptic_systems_container_registry_user
+    SRC_CRED_PASSWORD:
+      from_secret: git_cryptic_systems_container_registry_password
+    DEST_CRED_USERNAME:
+      from_secret: container_image_registry_user
+    DEST_CRED_PASSWORD:
+      from_secret: container_image_registry_password
+  image: quay.io/skopeo/stable:v1.14.0
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+  when:
+    status:
+    - changed
+    - failure
 
 trigger:
   branch:
@@ -425,74 +437,36 @@ kind: pipeline
 type: docker
 name: tagged-amd64
 
+clone:
+  disable: true
+
 platform:
   os: linux
   arch: amd64
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: build
-  image: docker.io/plugins/docker:latest
+  image: docker.io/plugins/docker:20.17.2
   settings:
-    dockerfile: Dockerfile
     auto_tag: true
     auto_tag_suffix: amd64
-    repo: volkerraschek/postfixadmin
-    username:
-      from_secret: container_image_registry_user
-    password:
-      from_secret: container_image_registry_password
-    build_args:
-    - POSTFIXADMIN_VERSION=${DRONE_TAG}
-    no_cache: true
-
-- name: email-notification
-  environment:
-    SMTP_FROM_ADDRESS:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
-      from_secret: smtp_host
-    SMTP_USERNAME:
-      from_secret: smtp_username
-    SMTP_PASSWORD:
-      from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/postfixadmin-docker
-
----
-kind: pipeline
-type: docker
-name: tagged-arm-v7
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build
-  image: docker.io/plugins/docker:latest
-  settings:
     dockerfile: Dockerfile
-    auto_tag: true
+    force_tag: true
-    auto_tag_suffix: arm-v7
+    no_cache: true
-    repo: volkerraschek/postfixadmin
+    purge: true
+    mirror:
+      from_secret: docker_io_mirror
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/postfixadmin
     username:
-      from_secret: container_image_registry_user
+      from_secret: git_cryptic_systems_container_registry_user
     password:
-      from_secret: container_image_registry_password
+      from_secret: git_cryptic_systems_container_registry_password
     build_args:
     - POSTFIXADMIN_VERSION=${DRONE_TAG}
-    no_cache: true
 
 - name: email-notification
   environment:
@@ -506,7 +480,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
@@ -523,25 +497,36 @@ kind: pipeline
 type: docker
 name: tagged-arm64-v8
 
+clone:
+  disable: true
+
 platform:
   os: linux
   arch: arm64
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: build
-  image: docker.io/plugins/docker:latest
+  image: docker.io/plugins/docker:20.17.2
   settings:
-    dockerfile: Dockerfile
     auto_tag: true
     auto_tag_suffix: arm64-v8
-    repo: volkerraschek/postfixadmin
+    dockerfile: Dockerfile
+    force_tag: true
+    no_cache: true
+    purge: true
+    mirror:
+      from_secret: docker_io_mirror
+    registry: git.cryptic.systems
+    repo: git.cryptic.systems/volker.raschek/postfixadmin
     username:
-      from_secret: container_image_registry_user
+      from_secret: git_cryptic_systems_container_registry_user
     password:
-      from_secret: container_image_registry_password
+      from_secret: git_cryptic_systems_container_registry_password
     build_args:
     - POSTFIXADMIN_VERSION=${DRONE_TAG}
-    no_cache: true
 
 - name: email-notification
   environment:
@@ -555,7 +540,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
@@ -572,17 +557,32 @@ kind: pipeline
 type: kubernetes
 name: tagged-manifest
 
+clone:
+  disable: true
+
+depends_on:
+- tagged-amd64
+- tagged-arm64-v8
+
+# docker.io/plugins/manifest only for amd64 architectures available
+node_selector:
+  kubernetes.io/os: linux
+  kubernetes.io/arch: amd64
+
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: build-manifest
-  image: docker.io/plugins/manifest:latest
+  image: docker.io/plugins/manifest:1.4.0
   settings:
     auto_tag: true
     ignore_missing: true
     spec: manifest.tmpl
     username:
-      from_secret: container_image_registry_user
+      from_secret: git_cryptic_systems_container_registry_user
     password:
-      from_secret: container_image_registry_password
+      from_secret: git_cryptic_systems_container_registry_password
 
 - name: email-notification
   environment:
@@ -596,7 +596,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
       cpu: 150
@@ -606,10 +606,62 @@ steps:
     - changed
     - failure
 
+trigger:
+  event:
+  - tag
+  repo:
+  - volker.raschek/postfixadmin-docker
+
+---
+kind: pipeline
+type: kubernetes
+name: tagged-sync
+
+clone:
+  disable: true
+
 depends_on:
-- tagged-amd64
+- tagged-manifest
-- tagged-arm-v7
+
-- tagged-arm64-v8
+steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
+- name: tagged-sync
+  commands:
+  - skopeo sync --all --src=docker --src-creds=$SRC_CRED_USERNAME:$SRC_CRED_PASSWORD --dest=docker --dest-creds=$DEST_CRED_USERNAME:$DEST_CRED_PASSWORD git.cryptic.systems/volker.raschek/postfixadmin docker.io/volkerraschek
+  environment:
+    SRC_CRED_USERNAME:
+      from_secret: git_cryptic_systems_container_registry_user
+    SRC_CRED_PASSWORD:
+      from_secret: git_cryptic_systems_container_registry_password
+    DEST_CRED_USERNAME:
+      from_secret: container_image_registry_user
+    DEST_CRED_PASSWORD:
+      from_secret: container_image_registry_password
+  image: quay.io/skopeo/stable:v1.14.0
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
+  when:
+    status:
+    - changed
+    - failure
 
 trigger:
   event:

.markdownlint.yaml

@@ -128,8 +128,8 @@ MD041:
 # MD044/proper-names - Proper names should have the correct capitalization
 MD044:
   # List of proper names
-  names:
+  names: []
-  - PostfixAdmin
+  # - PostfixAdmin
   # Include code blocks
   code_blocks: false
 

manifest.tmpl

@@ -1,4 +1,4 @@
-image: volkerraschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+image: git.cryptic.systems/volker.raschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
 {{#if build.tags}}
 tags:
 {{#each build.tags}}
@@ -8,18 +8,12 @@ tags:
 {{/if}}
 manifests:
   -
-    image: volkerraschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64
+    image: git.cryptic.systems/volker.raschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64
     platform:
       architecture: amd64
       os: linux
   -
-    image: volkerraschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-armv7
+    image: git.cryptic.systems/volker.raschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7
-  -
-    image: volkerraschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
     platform:
       architecture: arm64
       os: linux

renovate.json

@@ -11,6 +11,14 @@
       "matchManagers": "droneci",
       "matchUpdateTypes": [ "minor", "patch"]
     },
+    {
+      "description": "Automatically update patch version of used container images in docker files",
+      "addLabels": [ "renovate/container-image", "renovate/automerge" ],
+      "automerge": true,
+      "matchBaseBranches": [ "master" ],
+      "matchManagers": [ "dockerfile" ],
+      "matchUpdateTypes": [ "patch" ]
+    },
     {
       "description": "Trim leading postfixadmin- from git tag",
       "addLabels": [ "renovate/postfixadmin" ],