chore(deps): update dependency helm/helm to v3.15.2

This reverts commit 27a6c74aa3.

.drone.yml

@@ -6,17 +6,14 @@ name: linter
 clone:
   disable: true
 
-platform:
-  os: linux
-
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.34.0
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.41.0
   resources:
     limits:
       cpu: 150
@@ -34,7 +31,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
@@ -66,10 +63,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.3
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -99,73 +96,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/helm-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.2.1
-
-- 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/helm
-    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
@@ -198,10 +129,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.3
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -231,7 +162,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
@@ -264,10 +195,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.3
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -296,71 +227,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/helm-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.2.1
-
-- 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/helm
-    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
@@ -392,10 +259,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.3
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -424,7 +291,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
@@ -449,15 +316,19 @@ clone:
 
 depends_on:
 - latest-amd64
-- latest-arm-v7
 - 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.2.1
+  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
@@ -479,7 +350,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
@@ -511,7 +382,7 @@ depends_on:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: latest-sync
   commands:
@@ -525,7 +396,7 @@ steps:
       from_secret: container_image_registry_user
     DEST_CRED_PASSWORD:
       from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.12.0
+  image: quay.io/skopeo/stable:v1.15.2
 
 - name: email-notification
   environment:
@@ -539,7 +410,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
@@ -572,10 +443,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.3
   settings:
     auto_tag: true
     auto_tag_suffix: amd64
@@ -606,67 +477,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/helm-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.2.1
-
-- 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/helm
-    username:
-      from_secret: git_cryptic_systems_container_registry_user
-    password:
-      from_secret: git_cryptic_systems_container_registry_password
-    build_args:
-    - HELM_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
@@ -692,10 +503,10 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.3
   settings:
     auto_tag: true
     auto_tag_suffix: arm64-v8
@@ -726,7 +537,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
@@ -748,15 +559,19 @@ clone:
 
 depends_on:
 - tagged-amd64
-- tagged-arm-v7
 - 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.2.1
+  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
@@ -778,7 +593,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
@@ -807,7 +622,7 @@ depends_on:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: tagged-sync
   commands:
@@ -821,7 +636,7 @@ steps:
       from_secret: container_image_registry_user
     DEST_CRED_PASSWORD:
       from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.12.0
+  image: quay.io/skopeo/stable:v1.15.2
 
 - name: email-notification
   environment:
@@ -835,7 +650,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
+FROM docker.io/library/alpine:3.20.2
 
 ARG HELM_VERSION
 

Makefile

@@ -1,6 +1,6 @@
 # HELM_VERSION
 # Only required to install a specifiy version
-HELM_VERSION?=v3.12.1 # renovate: datasource=github-releases depName=helm/helm
+HELM_VERSION?=v3.15.2 # renovate: datasource=github-releases depName=helm/helm
 
 # CONTAINER_RUNTIME
 # The CONTAINER_RUNTIME variable will be used to specified the path to a

manifest.tmpl

@@ -12,12 +12,6 @@ manifests:
     platform:
       architecture: amd64
       os: linux
-  -
-    image: git.cryptic.systems/volker.raschek/helm:{{#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/helm:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
     platform:

renovate.json

@@ -1,8 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "assignees": [ "volker.raschek" ],
-  "automergeStrategy": "merge-commit",
-  "automergeType": "pr",
   "labels": [ "renovate" ],
   "packageRules": [
     {
@@ -11,6 +9,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" ]
+    },
     {
       "addLabels": [ "renovate/helm", "renovate/automerge" ],
       "automerge": false,