Merge pull request 'chore(deps): update dependency docker.io/library/alpine to v3.17.1' (#15) from renovate/docker.io-library-alpine-3.x into master

Reviewed-on: #15

.drone.yml

@@ -11,27 +11,29 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.28.1
+  image: docker.io/volkerraschek/markdownlint:0.33.0
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 50M
+      memory: 150M
 
 - name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      memory: 150M
   when:
     status:
     - changed
@@ -41,6 +43,172 @@ trigger:
   event:
     exclude:
     - tag
+
+---
+kind: pipeline
+type: docker
+name: dry-run-amd64
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    dry_run: true
+    tags: latest-amd64
+    repo: volkerraschek/network-tools
+    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:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/network-tools
+
+---
+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/network-tools
+    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:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/network-tools
+
+---
+kind: pipeline
+type: docker
+name: dry-run-arm64-v8
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    dry_run: true
+    tags: latest-arm64-v8
+    repo: volkerraschek/network-tools
+    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:
+    - master
+  event:
+  - pull_request
+  - push
+  repo:
+  - volker.raschek/network-tools
+
 ---
 kind: pipeline
 type: docker
@@ -52,7 +220,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     dockerfile: Dockerfile
     auto_tag: false
@@ -63,43 +231,41 @@ steps:
     password:
       from_secret: container_image_registry_password
     no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
-  when:
-    branch:
-    - master
 
-- name: notify
+- name: email-notification
-  image: drillster/drone-email
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
-volumes:
+depends_on:
-- name: docker_socket
+- linter
-  host:
-    path: /var/run/docker.sock
 
 trigger:
+  branch:
+  - master
   event:
-    exclude:
+  - cron
-    - tag
+  - push
+  repo:
+  - volker.raschek/network-tools
 
 ---
 kind: pipeline
 type: docker
-name: latest-armv7
+name: latest-arm-v7
 
 platform:
   os: linux
@@ -107,49 +273,100 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     dockerfile: Dockerfile
     auto_tag: false
-    tags: latest-armv7
+    tags: latest-arm-v7
     repo: volkerraschek/network-tools
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
     no_cache: true
-  when:
-    branch:
-    - master
 
-- name: notify
+- name: email-notification
-  image: drillster/drone-email
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
   when:
     status:
     - changed
     - failure
 
-volumes:
+depends_on:
-- name: docker_socket
+- linter
-  host:
-    path: /var/run/docker.sock
 
 trigger:
+  branch:
+  - master
   event:
-    exclude:
+  - cron
-    - tag
+  - push
+  repo:
+  - volker.raschek/network-tools
+
+---
+kind: pipeline
+type: docker
+name: latest-arm64-v8
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: false
+    tags: latest-arm64-v8
+    repo: volkerraschek/network-tools
+    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
+  event:
+  - cron
+  - push
+  repo:
+  - volker.raschek/network-tools
 
 ---
 kind: pipeline
@@ -158,7 +375,7 @@ name: latest-manifest
 
 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: false
     ignore_missing: true
@@ -168,21 +385,23 @@ steps:
     password:
       from_secret: container_image_registry_password
 
-- name: notify
+- name: email-notification
-  image: docker.io/drillster/drone-email:latest
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      memory: 150M
   when:
     status:
     - changed
@@ -190,12 +409,17 @@ steps:
 
 depends_on:
 - latest-amd64
-- latest-armv7
+- latest-arm-v7
+- latest-arm64-v8
 
 trigger:
+  branch:
+  - master
   event:
-    exclude:
+  - cron
-    - tag
+  - push
+  repo:
+  - volker.raschek/network-tools
 
 ---
 kind: pipeline
@@ -208,7 +432,7 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     dockerfile: Dockerfile
     auto_tag: true
@@ -219,31 +443,25 @@ steps:
     password:
       from_secret: container_image_registry_password
     no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
 
-- name: notify
+- name: email-notification
-  image: drillster/drone-email
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
-volumes:
-- name: docker_socket
-  host:
-    path: /var/run/docker.sock
-
 trigger:
   event:
   - tag
@@ -253,7 +471,7 @@ trigger:
 ---
 kind: pipeline
 type: docker
-name: tagged-armv7
+name: tagged-arm-v7
 
 platform:
   os: linux
@@ -261,41 +479,82 @@ platform:
 
 steps:
 - name: build
-  image: plugins/docker
+  image: docker.io/plugins/docker:latest
   settings:
     dockerfile: Dockerfile
     auto_tag: true
-    auto_tag_suffix: armv7
+    auto_tag_suffix: arm-v7
     repo: volkerraschek/network-tools
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
     no_cache: true
-  volumes:
-  - name: docker_socket
-    path: /var/run/docker.sock
 
-- name: notify
+- name: email-notification
-  image: drillster/drone-email
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   when:
     status:
     - changed
     - failure
 
-volumes:
+trigger:
-- name: docker_socket
+  event:
-  host:
+  - tag
-    path: /var/run/docker.sock
+  repo:
+  - volker.raschek/network-tools
+
+---
+kind: pipeline
+type: docker
+name: tagged-arm64-v8
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: docker.io/plugins/docker:latest
+  settings:
+    dockerfile: Dockerfile
+    auto_tag: true
+    auto_tag_suffix: arm64-v8
+    repo: volkerraschek/network-tools
+    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
 
 trigger:
   event:
@@ -310,7 +569,7 @@ name: tagged-manifest
 
 steps:
 - name: build-manifest
-  image: plugins/manifest
+  image: docker.io/plugins/manifest:latest
   settings:
     auto_tag: true
     ignore_missing: true
@@ -320,21 +579,23 @@ steps:
     password:
       from_secret: container_image_registry_password
 
-- name: notify
+- name: email-notification
-  image: docker.io/drillster/drone-email:latest
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: docker.io/volkerraschek/drone-email:0.1.1
-      from_secret: smtp_mail_address
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      memory: 150M
   when:
     status:
     - changed
@@ -342,59 +603,11 @@ steps:
 
 depends_on:
 - tagged-amd64
-- tagged-armv7
+- tagged-arm-v7
+- tagged-arm64-v8
 
 trigger:
   event:
   - tag
   repo:
   - volker.raschek/network-tools
-
----
-kind: pipeline
-type: kubernetes
-name: sync
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: github
-  image: docker.io/appleboy/drone-git-push:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  settings:
-    branch: master
-    remote: ssh://git@github.com/volker-raschek/network-tools.git
-    force: true
-    ssh_key:
-      from_secret: ssh_key
-
-- name: email-notification
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-  - push
-  repo:
-  - volker.raschek/network-tools

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/alpine:3.14.2
+FROM docker.io/library/alpine:3.17.1
 
 RUN apk add bind-tools curl iputils
 

Makefile

@@ -1,7 +1,7 @@
 # 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)
+CONTAINER_RUNTIME?=$(shell which podman)
 
 # NETWORKTOOLS_IMAGE_REGISTRY_NAME
 # Defines the name of the new container to be built using several variables.

manifest.tmpl

@@ -13,8 +13,14 @@ manifests:
       architecture: amd64
       os: linux
   -
-    image: volkerraschek/network-tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-armv7
+    image: volkerraschek/network-tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm-v7
     platform:
       architecture: arm
       os: linux
-      variant: v7
+      variant: v7
+  -
+    image: volkerraschek/network-tools:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-arm64-v8
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8

renovate.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "assignees": [ "volker.raschek" ],
+  "automergeStrategy": "merge-commit",
+  "automergeType": "pr",
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    }
+  ],
+  "rebaseLabel": "renovate/rebase",
+  "rebaseWhen": "behind-base-branch"
+}