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

.drone.yml

@@ -11,12 +11,12 @@ 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: markdown lint
   commands:
   - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.35.0
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.37.0
   resources:
     limits:
       cpu: 150
@@ -34,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
@@ -62,46 +62,18 @@ 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: unit-test
   commands:
   - go test -v ./...
-  image: docker.io/library/golang:1.21.0
+  image: docker.io/library/golang:1.21.4
 
 trigger:
   event:
     exclude:
     - tag
 
----
-kind: pipeline
-type: docker
-name: unit-test-arm-v7
-
-clone:
-  disable: true
-
-platform:
-  arch: arm
-
-steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
-
-- name: unit-test
-  commands:
-  - go test -v ./...
-  image: docker.io/library/golang:1.21.0
-
-trigger:
-  event:
-    include:
-    - pull_request
-    - push
-    exclude:
-    - tag
-
 ---
 kind: pipeline
 type: docker
@@ -115,12 +87,12 @@ 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: unit-test
   commands:
   - go test -v ./...
-  image: docker.io/library/golang:1.21.0
+  image: docker.io/library/golang:1.21.4
 
 trigger:
   event:
@@ -148,10 +120,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.17.1
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -181,74 +153,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-    exclude:
-    - master
-  event:
-  - pull_request
-  - push
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: docker
-name: dry-run-arm-v7
-
-clone:
-  disable: true
-
-depends_on:
-- linter
-- unit-test-arm-v7
-
-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/dcmerge
-    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
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
@@ -282,10 +187,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.17.1
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -315,7 +220,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
@@ -349,10 +254,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.17.1
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -381,72 +286,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: docker
-name: latest-arm-v7
-
-clone:
-  disable: true
-
-depends_on:
-- linter
-- unit-test-arm-v7
-
-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/dcmerge
-    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
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
@@ -479,10 +319,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.17.1
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -511,7 +351,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
@@ -536,7 +376,6 @@ clone:
 
 depends_on:
 - latest-amd64
-- latest-arm-v7
 - latest-arm64-v8
 
 # docker.io/plugins/manifest only for amd64 architectures available
@@ -546,7 +385,7 @@ node_selector:
 
 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:1.4.0
@@ -571,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
@@ -603,7 +442,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:
@@ -617,7 +456,7 @@ steps:
       from_secret: container_image_registry_user
     DEST_CRED_PASSWORD:
       from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.13.1
+  image: quay.io/skopeo/stable:v1.13.3
 
 - name: email-notification
   environment:
@@ -631,7 +470,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
@@ -664,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.17.1
   settings:
     auto_tag: true
     auto_tag_suffix: amd64
@@ -698,67 +537,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.2
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/dcmerge
-
----
-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/dcmerge
-    username:
-      from_secret: git_cryptic_systems_container_registry_user
-    password:
-      from_secret: git_cryptic_systems_container_registry_password
-    build_args:
-    - 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
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   when:
     status:
     - changed
@@ -784,10 +563,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.17.1
   settings:
     auto_tag: true
     auto_tag_suffix: arm64-v8
@@ -818,7 +597,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
@@ -840,7 +619,6 @@ clone:
 
 depends_on:
 - tagged-amd64
-- tagged-arm-v7
 - tagged-arm64-v8
 
 # docker.io/plugins/manifest only for amd64 architectures available
@@ -850,7 +628,7 @@ node_selector:
 
 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:1.4.0
@@ -875,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
@@ -904,7 +682,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:
@@ -918,7 +696,7 @@ steps:
       from_secret: container_image_registry_user
     DEST_CRED_PASSWORD:
       from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.13.1
+  image: quay.io/skopeo/stable:v1.13.3
 
 - name: email-notification
   environment:
@@ -932,7 +710,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/golang:1.21.0-alpine3.18 AS build
+FROM docker.io/library/golang:1.21.4-alpine3.18 AS build
 
 RUN apk add git make
 
@@ -10,7 +10,7 @@ RUN make install \
       PREFIX=/usr \
       VERSION=${VERSION}
 
-FROM docker.io/library/alpine:3.18.3
+FROM docker.io/library/alpine:3.18.4
 
 COPY --from=build /cache /
 

go.mod

@@ -3,7 +3,7 @@ module git.cryptic.systems/volker.raschek/dcmerge
 go 1.20
 
 require (
-	github.com/spf13/cobra v1.7.0
+	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
 	gopkg.in/yaml.v2 v2.4.0
 )

go.sum

@@ -1,4 +1,4 @@
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -6,8 +6,8 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
-github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
+github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=

manifest.tmpl

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