chore(deps): update docker.io/library/golang docker tag to v1.23.6

Reviewed-on: #24

.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.4.0
 
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.35.0
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.43.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
@@ -49,6 +49,59 @@ trigger:
     exclude:
     - tag
 
+---
+kind: pipeline
+type: docker
+name: unit-test-amd64
+
+clone:
+  disable: true
+
+platform:
+  arch: amd64
+
+steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
+
+- name: unit-test
+  commands:
+  - go test -v ./...
+  image: docker.io/library/golang:1.23.6
+
+trigger:
+  event:
+    exclude:
+    - tag
+
+---
+kind: pipeline
+type: docker
+name: unit-test-arm64
+
+clone:
+  disable: true
+
+platform:
+  arch: arm64
+
+steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
+
+- name: unit-test
+  commands:
+  - go test -v ./...
+  image: docker.io/library/golang:1.23.6
+
+trigger:
+  event:
+    include:
+    - pull_request
+    - push
+    exclude:
+    - tag
+
 ---
 kind: pipeline
 type: docker
@@ -59,6 +112,7 @@ clone:
 
 depends_on:
 - linter
+- unit-test-amd64
 
 platform:
   os: linux
@@ -66,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.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -99,73 +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
-
-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
@@ -191,6 +179,7 @@ clone:
 
 depends_on:
 - linter
+- unit-test-arm64
 
 platform:
   os: linux
@@ -198,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.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -231,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
@@ -257,6 +246,7 @@ clone:
 
 depends_on:
 - linter
+- unit-test-amd64
 
 platform:
   os: linux
@@ -264,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.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -296,71 +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
-
-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
@@ -385,6 +311,7 @@ clone:
 
 depends_on:
 - linter
+- unit-test-arm64
 
 platform:
   os: linux
@@ -392,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.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: false
     dockerfile: Dockerfile
@@ -424,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
@@ -449,7 +376,6 @@ clone:
 
 depends_on:
 - latest-amd64
-- latest-arm-v7
 - latest-arm64-v8
 
 # docker.io/plugins/manifest only for amd64 architectures available
@@ -459,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.4.0
 
 - name: build-manifest
   image: docker.io/plugins/manifest:1.4.0
@@ -484,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
@@ -516,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.4.0
 
 - name: latest-sync
   commands:
@@ -530,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.0
+  image: quay.io/skopeo/stable:v1.17.0
 
 - name: email-notification
   environment:
@@ -544,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
@@ -577,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.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: true
     auto_tag_suffix: amd64
@@ -611,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
@@ -697,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.4.0
 
 - name: build
-  image: docker.io/plugins/docker:20.10.9
+  image: docker.io/plugins/docker:20.18.6
   settings:
     auto_tag: true
     auto_tag_suffix: arm64-v8
@@ -731,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
@@ -753,7 +619,6 @@ clone:
 
 depends_on:
 - tagged-amd64
-- tagged-arm-v7
 - tagged-arm64-v8
 
 # docker.io/plugins/manifest only for amd64 architectures available
@@ -763,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.4.0
 
 - name: build-manifest
   image: docker.io/plugins/manifest:1.4.0
@@ -788,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
@@ -817,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.4.0
 
 - name: tagged-sync
   commands:
@@ -831,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.0
+  image: quay.io/skopeo/stable:v1.17.0
 
 - name: email-notification
   environment:
@@ -845,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

.markdownlint.yaml

@@ -45,11 +45,11 @@ MD012:
 # MD013/line-length - Line length
 MD013:
   # Number of characters
-  line_length: 80
+  line_length: 120
   # Number of characters for headings
-  heading_line_length: 80
+  heading_line_length: 120
   # Number of characters for code blocks
-  code_block_line_length: 80
+  code_block_line_length: 120
   # Include code blocks
   code_blocks: false
   # Include tables

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "rewrap.wrappingColumn": 120,
+}

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.20.6-alpine3.18 AS build
+FROM docker.io/library/golang:1.23.4-alpine3.19 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.2
+FROM docker.io/library/alpine:3.21
 
 COPY --from=build /cache /
 

README.md

@@ -3,22 +3,18 @@
 [![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/dcmerge/status.svg)](https://drone.cryptic.systems/volker.raschek/dcmerge)
 [![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/dcmerge)](https://hub.docker.com/r/volkerraschek/dcmerge)
 
-`dcmerge` is a small program to merge docker-compose files from multiple
-sources. It is available via RPM and docker.
+`dcmerge` is a small program to merge docker-compose files from multiple sources. It is available via RPM and docker.
 
-The dynamic pattern of a docker-compose file, that for example `environments`
-can be specified as a string slice or a list of objects is currently not
-supported. `dcmerge` expect a strict pattern layout. The `environments`, `ports`
-and `volumes` must be declared as a slice of strings.
+The dynamic pattern of a docker-compose file, that for example `environments` can be specified as a string slice or a
+list of objects is currently not supported. `dcmerge` expect a strict pattern layout. The `environments`, `ports` and
+`volumes` must be declared as a slice of strings.
 
-Dockercompose file can be read-in from different sources. Currently are the
-following sources supported:
+Dockercompose file can be read-in from different sources. Currently are the following sources supported:
 
 - File
 - HTTP/HTTPS
 
-Furthermore, `dcmerge` support different ways to merge multiple docker-compose
-files.
+Furthermore, `dcmerge` support different ways to merge multiple docker-compose files.
 
 - The default merge, add missing secrets, services, networks and volumes.
 - The existing-win merge, add and protect existing attributes.
@@ -26,9 +22,8 @@ files.
 
 ## default
 
-Merge only missing secrets, services, networks and volumes without respecting
-their attributes. For example, when the service `app` is already declared, it is
-not possible to add the service `app` twice. The second service will be
+Merge only missing secrets, services, networks and volumes **without respecting their attributes**. For example, when
+the service `app` is already declared, it is not possible to add the service `app` twice. The second service will be
 completely skipped.
 
 ```yaml
@@ -68,10 +63,9 @@ services:
 
 ## existing-win
 
-The existing-win merge protects existing attributes. For example there are two
-different docker-compose files, but booth has the same environment variable
-`CLIENT_SECRET` defined with different values. The first declaration of the
-attribute wins and is for overwriting protected.
+The existing-win merge protects existing attributes. For example there are two different docker-compose files, but booth
+has the same environment variable `CLIENT_SECRET` defined with different values. The first declaration of the attribute
+wins and is for overwriting protected.
 
 ```yaml
 ---
@@ -99,9 +93,8 @@ services:
 
 ## last-win
 
-The last-win merge overwrite recursive existing attributes. For example there
-are two different docker-compose files, but booth has the same environment
-variable `CLIENT_SECRET` defined with different values. The last passed
+The last-win merge overwrite recursive existing attributes. For example there are two different docker-compose files,
+but booth has the same environment variable `CLIENT_SECRET` defined with different values. The last passed
 docker-compose file which contains this environment wins.
 
 ```yaml

cmd/root.go

@@ -42,6 +42,7 @@ dcmerge docker-compose.yml https://git.example.local/user/repo/docker-compose.ym
 		RunE:    run,
 		Version: version,
 	}
+	rootCmd.Flags().BoolP("existing-win", "f", false, "Protect existing attributes")
 	rootCmd.Flags().BoolP("last-win", "l", false, "Overwrite existing attributes")
 	rootCmd.Flags().StringP("output-file", "o", "", "Write instead on stdout into a file")
 	rootCmd.AddCommand(completionCmd)
@@ -50,6 +51,11 @@ dcmerge docker-compose.yml https://git.example.local/user/repo/docker-compose.ym
 }
 
 func run(cmd *cobra.Command, args []string) error {
+	mergeExisting, err := cmd.Flags().GetBool("existing-win")
+	if err != nil {
+		return fmt.Errorf("Failed to parse flag last-win: %s", err)
+	}
+
 	mergeLastWin, err := cmd.Flags().GetBool("last-win")
 	if err != nil {
 		return fmt.Errorf("Failed to parse flag last-win: %s", err)
@@ -69,12 +75,15 @@ func run(cmd *cobra.Command, args []string) error {
 
 	for _, config := range dockerComposeConfigs {
 		switch {
-		case mergeLastWin:
+		case mergeExisting && mergeLastWin:
+			return fmt.Errorf("Neither --first-win or --last-win can be specified - not booth.")
+		case mergeExisting && !mergeLastWin:
+			dockerComposeConfig.MergeExistingWin(config)
+		case !mergeExisting && mergeLastWin:
 			dockerComposeConfig.MergeLastWin(config)
 		default:
 			dockerComposeConfig.Merge(config)
 		}
-
 	}
 
 	switch {

go.mod

@@ -3,8 +3,8 @@ module git.cryptic.systems/volker.raschek/dcmerge
 go 1.20
 
 require (
-	github.com/spf13/cobra v1.7.0
-	github.com/stretchr/testify v1.8.4
+	github.com/spf13/cobra v1.8.1
+	github.com/stretchr/testify v1.10.0
 	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.4/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,12 +6,12 @@ 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.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
 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=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

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:

pkg/fetcher/fetcher.go

@@ -75,7 +75,7 @@ func getDockerComposeViaHTTP(url string) (*dockerCompose.Config, error) {
 func readDockerComposeFromFile(name string) (*dockerCompose.Config, error) {
 	fileStat, err := os.Stat(name)
 	switch {
-	case errors.Is(err, os.ErrNotExist):
+	case err != nil:
 		return nil, err
 	case fileStat.IsDir():
 		return nil, fmt.Errorf("%w: %s", ErrorPathIsDir, name)

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": [
     {
@@ -17,15 +15,19 @@
       "automerge": true,
       "matchBaseBranches": [ "master" ],
       "matchManagers": [ "dockerfile" ],
-      "matchUpdateTypes": [ "patch" ]
+      "matchUpdateTypes": [ "minor", "patch" ]
     },
     {
-      "addLabels": [ "renovate/dcmerge", "renovate/automerge" ],
-      "automerge": false,
-      "matchPackageNames": [ "dcmerge" ],
-      "matchManagers": [ "regex" ]
+      "description": "Automatically update minor and patch versions of go modules",
+      "addLabels": [ "renovate/gomod", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": [ "gomod" ],
+      "matchUpdateTypes": [ "minor", "patch" ]
     }
   ],
+  "postUpdateOptions": [
+    "gomodTidy"
+  ],
   "rebaseLabel": "renovate/rebase",
   "rebaseWhen": "behind-base-branch"
 }

test/assets/docker-compose-a.yaml

@@ -0,0 +1,12 @@
+version: "3.3"
+services:
+  app:
+    depends_on:
+    - oracle
+    environment:
+    - HTTP_PROXY=1.2.3.4:8080
+    image: repository:version
+    ports:
+    - 8080:80
+    volumes:
+    - /etc/localtime:/etc/localtime

test/assets/docker-compose-b.yaml

@@ -0,0 +1,12 @@
+version: "3.3"
+services:
+  app:
+    depends_on:
+    - postgres
+    environment:
+    - HTTP_PROXY=4.3.2.1:8080
+    image: repository:version
+    ports:
+    - 10080:80
+    volumes:
+    - /usr/share/zoneinfo/UTC:/etc/localtime