chore(deps): update docker.io/plugins/docker docker tag to v20.17.4

This reverts commit 5ffaeaf154.

.markdownlint.yaml

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

Dockerfile

@@ -1,7 +1,7 @@
 FROM docker.io/library/php:7.4-apache
 
 # POSTFIXADMIN VERSION
-ARG POSTFIXADMIN_VERSION=3.3.9
+ARG POSTFIXADMIN_VERSION
 
 # APACHE
 ENV APACHE_DOCUMENT_ROOT /var/www/html/public

Makefile

@@ -1,48 +1,50 @@
-# CONTAINER_RUNTIME
-# The CONTAINER_RUNTIME variable will be used to specified the path to a
-# container runtime. This is needed to start and run a container image.
-CONTAINER_RUNTIME?=$(shell which docker)
+# POSTFIXADMIN_VERSION
+# Only required to install a specifiy version
+POSTFIXADMIN_VERSION?=3.3.13
 
-# POSTFIXADMIN_IMAGE_REGISTRY_NAME
-# Defines the name of the new container to be built using several variables.
-POSTFIXADMIN_IMAGE_REGISTRY_NAME:=docker.io
-POSTFIXADMIN_IMAGE_REGISTRY_USER:=volkerraschek
+# PODMAN_BIN's and tools
+PODMAN_BIN?=$(shell which podman)
 
-POSTFIXADMIN_IMAGE_NAMESPACE?=${POSTFIXADMIN_IMAGE_REGISTRY_USER}
-POSTFIXADMIN_IMAGE_NAME:=postfixadmin
+# POSTFIXADMIN_IMAGE
+POSTFIXADMIN_IMAGE_REGISTRY_HOST:=git.cryptic.systems
+POSTFIXADMIN_IMAGE_REPOSITORY?=volker.raschek/postfixadmin
 POSTFIXADMIN_IMAGE_VERSION?=latest
-POSTFIXADMIN_IMAGE_FULLY_QUALIFIED=${POSTFIXADMIN_IMAGE_REGISTRY_NAME}/${POSTFIXADMIN_IMAGE_NAMESPACE}/${POSTFIXADMIN_IMAGE_NAME}:${POSTFIXADMIN_IMAGE_VERSION}
-POSTFIXADMIN_IMAGE_UNQUALIFIED=${POSTFIXADMIN_IMAGE_NAMESPACE}/${POSTFIXADMIN_IMAGE_NAME}:${POSTFIXADMIN_IMAGE_VERSION}
+POSTFIXADMIN_IMAGE_FULLY_QUALIFIED=${POSTFIXADMIN_IMAGE_REGISTRY_HOST}/${POSTFIXADMIN_IMAGE_REPOSITORY}:${POSTFIXADMIN_IMAGE_VERSION}
 
 # BUILD CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/build
 container-image/build:
-	${CONTAINER_RUNTIME} build \
+	${PODMAN_BIN} build \
 		--build-arg POSTFIXADMIN_VERSION=${POSTFIXADMIN_VERSION} \
 		--file Dockerfile \
 		--no-cache \
 		--pull \
 		--tag ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED} \
-		--tag ${POSTFIXADMIN_IMAGE_UNQUALIFIED} \
 		.
 
 # DELETE CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/delete
 container-image/delete:
-	- ${CONTAINER_RUNTIME} image rm ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED} ${POSTFIXADMIN_IMAGE_UNQUALIFIED}
-	- ${CONTAINER_RUNTIME} image rm ${PHP_IMAGE_FULL}
+	- ${PODMAN_BIN} image rm ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED}
 
 # PUSH CONTAINER IMAGE
 # ==============================================================================
 PHONY+=container-image/push
 container-image/push:
-	echo ${POSTFIXADMIN_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${POSTFIXADMIN_IMAGE_REGISTRY_NAME} --username ${POSTFIXADMIN_IMAGE_REGISTRY_USER} --password-stdin
-	${CONTAINER_RUNTIME} push ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED}
+	echo ${POSTFIXADMIN_IMAGE_REGISTRY_PASSWORD} | ${PODMAN_BIN} login ${POSTFIXADMIN_IMAGE_REGISTRY_NAME} --username ${POSTFIXADMIN_IMAGE_REGISTRY_USER} --password-stdin
+	${PODMAN_BIN} push ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED}
+	${PODMAN_BIN} logout ${POSTFIXADMIN_IMAGE_REGISTRY_HOST}
+
+# PUSH CONTAINER IMAGE TO DOCKER
+# ==============================================================================
+PHONY+=container-image/push-to-docker-daemon
+container-image/push-to-docker-daemon:
+	${PODMAN_BIN} push ${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED} docker-daemon:${POSTFIXADMIN_IMAGE_FULLY_QUALIFIED}
 
 # PHONY
 # ==============================================================================
 # Declare the contents of the PHONY variable as phony.  We keep that information
 # in a variable so we can use it in if_changed.
-.PHONY: ${PHONY}
+.PHONY: ${PHONY}

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
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7
-  -
-    image: volkerraschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
+    image: git.cryptic.systems/volker.raschek/postfixadmin:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
     platform:
       architecture: arm64
       os: linux

renovate.json

@@ -1,22 +1,45 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "automerge": false,
-  "automergeStrategy": "merge-commit",
-  "automergeType": "pr",
+  "assignees": [ "volker.raschek" ],
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+      "automerge": true,
+      "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" ],
+      "automerge": false,
+      "extractVersion": "^postfixadmin-(?<version>\\d+\\.\\d+\\.\\d+)$",
+      "matchPackageNames": [ "postfixadmin/postfixadmin" ],
+      "matchManagers": [ "regex" ]
+    }
+  ],
   "rebaseLabel": "renovate/rebase",
   "rebaseWhen": "behind-base-branch",
   "regexManagers": [
     {
       "description": "Update postfixadmin git tag",
       "fileMatch": [
-        "^Dockerfile$"
+        "^Makefile$"
       ],
       "matchStrings": [
-        "ARG POSTFIXADMIN_VERSION=(?<currentValue>.*?)\n"
+        "POSTFIXADMIN_VERSION\\?=(?<currentValue>.*?)\n"
       ],
-      "depNameTemplate": "postfixadmin/postfixadmin",
       "datasourceTemplate": "github-tags",
-      "versioningTemplate": "regex:^(postfixadmin-)?(v)?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\s"
+      "depNameTemplate": "postfixadmin/postfixadmin",
+      "versioningTemplate": "regex:^(postfixadmin-)?(v)?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(\\s*)?$"
     }
   ]
 }