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

Reviewed-on: #35

.drone.yml

@@ -11,13 +11,12 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-amd64
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.37.0
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.44.0
   resources:
     limits:
       cpu: 150
@@ -35,7 +34,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
       cpu: 150
@@ -67,11 +66,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-amd64
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.8
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -101,74 +99,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-    exclude:
-    - master
-  event:
-  - pull_request
-  - push
-  repo:
-  - volker.raschek/git-docker
-
----
-kind: pipeline
-type: docker
-name: dry-run-arm-v7
-
-clone:
-  disable: true
-
-depends_on:
-- linter
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-arm-v7
-  pull: always
-
-- name: build
-  image: docker.io/plugins/docker:20.10.9
-  settings:
-    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/git
-    tags: latest-arm-v7
-    username:
-      from_secret: git_cryptic_systems_container_registry_user
-    password:
-      from_secret: git_cryptic_systems_container_registry_password
-
-- 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.2
   when:
     status:
     - changed
@@ -201,11 +132,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-arm64-v8
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.8
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -235,7 +165,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
@@ -268,11 +198,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-amd64
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.8
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -301,72 +230,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/git-docker
-
----
-kind: pipeline
-type: docker
-name: latest-arm-v7
-
-clone:
-  disable: true
-
-depends_on:
-- linter
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-arm-v7
-  pull: always
-
-- name: build
-  image: docker.io/plugins/docker:20.10.9
-  settings:
-    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/git
-    tags: latest-arm-v7
-    username:
-      from_secret: git_cryptic_systems_container_registry_user
-    password:
-      from_secret: git_cryptic_systems_container_registry_password
-
-- 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.2
   when:
     status:
     - changed
@@ -398,11 +262,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-arm64-v8
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.8
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -431,7 +294,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
@@ -456,7 +319,6 @@ clone:
 
 depends_on:
 - latest-amd64
-- latest-arm-v7
 - latest-arm64-v8
 
 # docker.io/plugins/manifest only for amd64 architectures available
@@ -466,8 +328,7 @@ node_selector:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-amd64
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: build-manifest
   image: docker.io/plugins/manifest:1.4.0
@@ -492,7 +353,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
       cpu: 150
@@ -524,8 +385,7 @@ depends_on:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-amd64
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: latest-sync
   commands:
@@ -539,7 +399,7 @@ steps:
       from_secret: container_image_registry_user
     DEST_CRED_PASSWORD:
       from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.13.2
+  image: quay.io/skopeo/stable:v1.18.0
 
 - name: email-notification
   environment:
@@ -553,7 +413,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
       cpu: 150
@@ -586,11 +446,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-amd64
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.8
   settings:
     auto_tag: true
     auto_tag_suffix: amd64
@@ -621,68 +480,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/git-docker
-
----
-kind: pipeline
-type: docker
-name: tagged-arm-v7
-
-clone:
-  disable: true
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-arm-v7
-  pull: always
-
-- name: build
-  image: docker.io/plugins/docker:20.10.9
-  settings:
-    auto_tag: true
-    auto_tag_suffix: arm-v7
-    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/git
-    username:
-      from_secret: git_cryptic_systems_container_registry_user
-    password:
-      from_secret: git_cryptic_systems_container_registry_password
-    build_args:
-    - GOSEC_VERSION=${DRONE_TAG}
-
-- 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.2
   when:
     status:
     - changed
@@ -708,11 +506,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-arm64-v8
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.8
   settings:
     auto_tag: true
     auto_tag_suffix: arm64-v8
@@ -743,7 +540,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
@@ -765,7 +562,6 @@ clone:
 
 depends_on:
 - tagged-amd64
-- tagged-arm-v7
 - tagged-arm64-v8
 
 # docker.io/plugins/manifest only for amd64 architectures available
@@ -775,8 +571,7 @@ node_selector:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-amd64
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: build-manifest
   image: docker.io/plugins/manifest:1.4.0
@@ -801,7 +596,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
       cpu: 150
@@ -830,8 +625,7 @@ depends_on:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.3.0-amd64
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
-  pull: always
 
 - name: tagged-sync
   commands:
@@ -845,7 +639,7 @@ steps:
       from_secret: container_image_registry_user
     DEST_CRED_PASSWORD:
       from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.13.2
+  image: quay.io/skopeo/stable:v1.18.0
 
 - name: email-notification
   environment:
@@ -859,7 +653,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
       cpu: 150

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/alpine:3.18.4
+FROM docker.io/library/alpine:3.21.3
 RUN apk add --no-cache \
       bash \
       ca-certificates \

Makefile

@@ -5,14 +5,13 @@ CONTAINER_RUNTIME?=$(shell which podman)
 
 # GIT_IMAGE_REGISTRY_NAME
 # Defines the name of the new container to be built using several variables.
-GIT_IMAGE_REGISTRY_NAME:=git.cryptic.systems
+GIT_IMAGE_REGISTRY_NAME?=git.cryptic.systems
-GIT_IMAGE_REGISTRY_USER:=volker.raschek
+GIT_IMAGE_REGISTRY_USER?=volker.raschek
 
 GIT_IMAGE_NAMESPACE?=${GIT_IMAGE_REGISTRY_USER}
 GIT_IMAGE_NAME:=git
 GIT_IMAGE_VERSION?=latest
 GIT_IMAGE_FULLY_QUALIFIED=${GIT_IMAGE_REGISTRY_NAME}/${GIT_IMAGE_NAMESPACE}/${GIT_IMAGE_NAME}:${GIT_IMAGE_VERSION}
-GIT_IMAGE_UNQUALIFIED=${GIT_IMAGE_NAMESPACE}/${GIT_IMAGE_NAME}:${GIT_IMAGE_VERSION}
 
 # BUILD CONTAINER IMAGE
 # ==============================================================================
@@ -23,15 +22,14 @@ container-image/build:
 		--no-cache \
 		--pull \
 		--tag ${GIT_IMAGE_FULLY_QUALIFIED} \
-		--tag ${GIT_IMAGE_UNQUALIFIED} \
+		--tag \
 		.
 
 # DELETE CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/delete
 container-image/delete:
-	- ${CONTAINER_RUNTIME} image rm ${GIT_IMAGE_FULLY_QUALIFIED} ${GIT_IMAGE_UNQUALIFIED}
+	- ${CONTAINER_RUNTIME} image rm ${GIT_IMAGE_FULLY_QUALIFIED}
-	- ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULL}
 
 # PUSH CONTAINER IMAGE
 # ==============================================================================

manifest.tmpl

@@ -12,12 +12,6 @@ manifests:
     platform:
       architecture: amd64
       os: linux
-  -
-    image: git.cryptic.systems/volker.raschek/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm-v7
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7
   -
     image: git.cryptic.systems/volker.raschek/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
     platform:

renovate.json

@@ -1,37 +1,9 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "assignees": [ "volker.raschek" ],
+  "extends": [
-  "automergeStrategy": "merge-commit",
+    "local>volker.raschek/renovate-config:default#master",
-  "automergeType": "pr",
+    "local>volker.raschek/renovate-config:container#master",
-  "labels": [ "renovate" ],
+    "local>volker.raschek/renovate-config:actions#master",
-  "packageRules": [
+    "local>volker.raschek/renovate-config:regexp#master"
-    {
-      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
-      "automerge": true,
-      "excludePackagePatterns": [ "plugins/docker" ],
-      "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" ]
-    }
-  ],
-  "rebaseLabel": "renovate/rebase",
-  "rebaseWhen": "behind-base-branch",
-  "regexManagers": [
-    {
-      "description": "Update version",
-      "fileMatch": [
-        "^Makefile$"
-      ],
-      "matchStrings": [
-        "GOSEC_VERSION\\?=(?<currentValue>.*) # renovate: datasource=(?<datasource>.*) depName=(?<depName>.*)( lookupName=(?<lookupName>.*))?( versioning=(?<versioning>.*))?"
-      ]
-    }
   ]
 }