fix(riscv64): add support

This patch extends dcmerge to support the command attribut of a defined service.
For example:

```yaml
services:
  busybox
    command: [ "/usr/bin/cp", "--recursive", "--force", "/tmp/bar.txt", "/tmp/foo.txt"]
    image: library/busybox:latest
```

The command attribute is interpreted as a whole. This means that individual
arguments are not merged as a comparison, as this would change the meaning of
the command attribute.

.drone.yml

@@ -1,862 +0,0 @@
----
-kind: pipeline
-type: kubernetes
-name: linter
-
-clone:
-  disable: true
-
-platform:
-  os: linux
-
-steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
-
-- name: markdown lint
-  commands:
-  - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.35.0
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-
-- 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
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-    exclude:
-    - tag
-
----
-kind: pipeline
-type: docker
-name: dry-run-amd64
-
-clone:
-  disable: true
-
-depends_on:
-- linter
-
-platform:
-  os: linux
-  arch: amd64
-
-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-amd64
-    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
-    - 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
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-    exclude:
-    - master
-  event:
-  - pull_request
-  - push
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: docker
-name: dry-run-arm64-v8
-
-clone:
-  disable: true
-
-depends_on:
-- linter
-
-platform:
-  os: linux
-  arch: arm64
-
-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-arm64-v8
-    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
-    - failure
-
-trigger:
-  branch:
-    exclude:
-    - master
-  event:
-  - pull_request
-  - push
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: docker
-name: latest-amd64
-
-clone:
-  disable: true
-
-depends_on:
-- linter
-
-platform:
-  os: linux
-  arch: amd64
-
-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-amd64
-    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
-    - 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
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: docker
-name: latest-arm64-v8
-
-clone:
-  disable: true
-
-depends_on:
-- linter
-
-platform:
-  os: linux
-  arch: arm64
-
-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-arm64-v8
-    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
-    - failure
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: kubernetes
-name: latest-manifest
-
-clone:
-  disable: true
-
-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
-
-- name: build-manifest
-  image: docker.io/plugins/manifest:1.4.0
-  settings:
-    auto_tag: false
-    ignore_missing: true
-    spec: manifest.tmpl
-    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
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: kubernetes
-name: latest-sync
-
-clone:
-  disable: true
-
-depends_on:
-- latest-manifest
-
-steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
-
-- name: latest-sync
-  commands:
-  - skopeo sync --all --src=docker --src-creds=$SRC_CRED_USERNAME:$SRC_CRED_PASSWORD --dest=docker --dest-creds=$DEST_CRED_USERNAME:$DEST_CRED_PASSWORD git.cryptic.systems/volker.raschek/dcmerge docker.io/volkerraschek
-  environment:
-    SRC_CRED_USERNAME:
-      from_secret: git_cryptic_systems_container_registry_user
-    SRC_CRED_PASSWORD:
-      from_secret: git_cryptic_systems_container_registry_password
-    DEST_CRED_USERNAME:
-      from_secret: container_image_registry_user
-    DEST_CRED_PASSWORD:
-      from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.13.0
-
-- 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
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: docker
-name: tagged-amd64
-
-clone:
-  disable: true
-
-platform:
-  os: linux
-  arch: amd64
-
-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: amd64
-    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
-  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
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: docker
-name: tagged-arm64-v8
-
-clone:
-  disable: true
-
-platform:
-  os: linux
-  arch: arm64
-
-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: arm64-v8
-    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
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: kubernetes
-name: tagged-manifest
-
-clone:
-  disable: true
-
-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
-
-- name: build-manifest
-  image: docker.io/plugins/manifest:1.4.0
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    spec: manifest.tmpl
-    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
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/dcmerge
-
----
-kind: pipeline
-type: kubernetes
-name: tagged-sync
-
-clone:
-  disable: true
-
-depends_on:
-- tagged-manifest
-
-steps:
-- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.2.1
-
-- name: tagged-sync
-  commands:
-  - skopeo sync --all --src=docker --src-creds=$SRC_CRED_USERNAME:$SRC_CRED_PASSWORD --dest=docker --dest-creds=$DEST_CRED_USERNAME:$DEST_CRED_PASSWORD git.cryptic.systems/volker.raschek/dcmerge docker.io/volkerraschek
-  environment:
-    SRC_CRED_USERNAME:
-      from_secret: git_cryptic_systems_container_registry_user
-    SRC_CRED_PASSWORD:
-      from_secret: git_cryptic_systems_container_registry_password
-    DEST_CRED_USERNAME:
-      from_secret: container_image_registry_user
-    DEST_CRED_PASSWORD:
-      from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.13.0
-
-- 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
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/dcmerge

.gitea/workflows/golang-tests.yaml

@@ -0,0 +1,21 @@
+name: Golang Tests
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+
+jobs:
+  unittest:
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - uses: actions/setup-go@v5.5.0
+      with:
+        go-version: stable
+    - env:
+        GOPROXY: ${{ vars.GOPROXY }}
+      run: make test/unit

.gitea/workflows/markdown-linters.yaml

@@ -0,0 +1,20 @@
+name: Markdown linter
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+  workflow_dispatch: {}
+
+jobs:
+  markdown-lint:
+    container:
+      image: git.cryptic.systems/volker.raschek/markdownlint:0.45.0
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - name: Lint Markdown files
+      run: markdownlint --config .markdownlint.yaml .

.gitea/workflows/release.yaml

@@ -0,0 +1,52 @@
+name: Release
+
+on:
+  push:
+    tags: [ '**' ]
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - uses: docker/setup-qemu-action@v3.6.0
+    - uses: actions/setup-go@v5.5.0
+      with:
+        go-version: stable
+    - uses: docker/login-action@v3.4.0
+      with:
+        registry: git.cryptic.systems
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }}
+    - env:
+        GITEA_TOKEN: ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }}
+        GONOSUMDB: ${{ vars.GONOSUMDB }}
+        GOPROXY: ${{ vars.GOPROXY }}
+      uses: goreleaser/goreleaser-action@v6.3.0
+      with:
+        version: "~> v2"
+        args: release --clean
+
+  sync-to-hub-docker-io:
+    needs:
+    - release
+    runs-on: ubuntu-latest
+    steps:
+    - name: Copy images to docker.io
+      run: |
+        TAG=$(echo ${{ github.ref_name }} | sed 's/v//gm')
+
+        apt-get update --yes
+        apt-get install --yes skopeo
+        skopeo copy \
+          --all \
+          --dest-password ${{ secrets.DOCKER_IO_PASSWORD }} \
+          --dest-username ${{ secrets.DOCKER_IO_USERNAME }} \
+          --src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \
+          --src-username volker.raschek \
+            docker://git.cryptic.systems/volker.raschek/dcmerge:${TAG} \
+            docker://docker.io/volkerraschek/dcmerge:${TAG}

.gitea/workflows/update-docker-hub-description.yaml

@@ -0,0 +1,19 @@
+name: Update Docker Hub Description
+
+on:
+  push:
+    branches: [ 'master' ]
+    paths: [ 'README.md' ]
+
+jobs:
+  update-description-on-hub-docker-io:
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - uses: peter-evans/dockerhub-description@v4.0.2
+      with:
+        username: ${{ secrets.DOCKER_IO_USERNAME }}
+        password: ${{ secrets.DOCKER_IO_PASSWORD }}
+        repository: volkerraschek/dcmerge
+        readme-filepath: README.md

.gitignore

@@ -1 +1,2 @@
 dcmerge
+coverage.txt

.goreleaser.yaml

@@ -0,0 +1,175 @@
+project_name: dcmerge
+
+archives:
+- formats: [ "tar.xz" ]
+  files:
+  - README.md
+  - LICENSE
+
+before:
+  hooks:
+  - go mod tidy
+
+builds:
+- main: main.go
+  binary: >-
+    {{ .ProjectName }}-
+    {{- .Version }}-
+    {{- .Os }}-
+    {{- if eq .Arch "amd64" }}amd64
+    {{- else if eq .Arch "amd64_v1" }}amd64
+    {{- else }}{{ .Arch }}{{ end }}
+    {{- if .Arm }}-{{ .Arm }}{{ end }}
+  env:
+  - CGO_ENABLED=0
+  - GONOSUMDB={{ .Env.GONOSUMDB }}
+  - GOPROXY={{ .Env.GOPROXY }}
+  goos:
+  - linux
+  goarch:
+  - amd64
+  - arm
+  - arm64
+  - riscv64
+  goarm:
+  - "6"
+  - "7"
+  flags:
+  - -trimpath
+  ldflags:
+  - -s -w -X 'main.version={{ trimprefix .Tag "v" }}'
+
+changelog:
+  filters:
+    exclude:
+    - '^chore'
+    - '^docs'
+    - '^test'
+    - Merge pull request
+    - Merge branch
+    - go mod tidy
+  format: "{{.SHA}}: {{.Message}} (@{{.AuthorUsername}})"
+  groups:
+  - title: Features
+    regexp: '^.*?feat(\([[:word:]]+\))??!?:.+$'
+    order: 0
+  - title: "Bug fixes"
+    regexp: '^.*?fix(\([[:word:]]+\))??!?:.+$'
+    order: 1
+  - title: Others
+    order: 999
+  sort: asc
+  use: git
+
+dockers:
+- build_flag_templates:
+  - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+  - --label=org.opencontainers.image.description={{ .ProjectName }}
+  - --label=org.opencontainers.image.documentation={{ .ProjectName }}
+  - --label=org.opencontainers.image.revision={{ .FullCommit }}
+  - --label=org.opencontainers.image.source={{ .GitURL }}
+  - --label=org.opencontainers.image.title={{ .ProjectName }}
+  - --label=org.opencontainers.image.url=https://git.cryptic.systems/volker.raschek/{{ .ProjectName }}
+  - --label=org.opencontainers.image.version={{ trimprefix .Tag "v" }}
+  - --platform=linux/amd64
+  - --pull
+  dockerfile: Dockerfile
+  goarch: amd64
+  goos: linux
+  image_templates:
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-amd64'
+  skip_push: false
+  use: buildx
+
+- build_flag_templates:
+  - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+  - --label=org.opencontainers.image.description={{ .ProjectName }}
+  - --label=org.opencontainers.image.documentation={{ .ProjectName }}
+  - --label=org.opencontainers.image.revision={{ .FullCommit }}
+  - --label=org.opencontainers.image.source={{ .GitURL }}
+  - --label=org.opencontainers.image.title={{ .ProjectName }}
+  - --label=org.opencontainers.image.url=https://git.cryptic.systems/volker.raschek/{{ .ProjectName }}
+  - --label=org.opencontainers.image.version={{ trimprefix .Tag "v" }}
+  - --platform=linux/arm/v6
+  - --pull
+  dockerfile: Dockerfile
+  goarch: arm
+  goarm: "6"
+  goos: linux
+  image_templates:
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-arm-v6'
+  skip_push: false
+  use: buildx
+
+- build_flag_templates:
+  - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+  - --label=org.opencontainers.image.description={{ .ProjectName }}
+  - --label=org.opencontainers.image.documentation={{ .ProjectName }}
+  - --label=org.opencontainers.image.revision={{ .FullCommit }}
+  - --label=org.opencontainers.image.source={{ .GitURL }}
+  - --label=org.opencontainers.image.title={{ .ProjectName }}
+  - --label=org.opencontainers.image.url=https://git.cryptic.systems/volker.raschek/{{ .ProjectName }}
+  - --label=org.opencontainers.image.version={{ trimprefix .Tag "v" }}
+  - --platform=linux/arm/v7
+  - --pull
+  dockerfile: Dockerfile
+  goarch: arm
+  goarm: "7"
+  goos: linux
+  image_templates:
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-arm-v7'
+  skip_push: false
+  use: buildx
+
+- build_flag_templates:
+  - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+  - --label=org.opencontainers.image.description={{ .ProjectName }}
+  - --label=org.opencontainers.image.documentation={{ .ProjectName }}
+  - --label=org.opencontainers.image.revision={{ .FullCommit }}
+  - --label=org.opencontainers.image.source={{ .GitURL }}
+  - --label=org.opencontainers.image.title={{ .ProjectName }}
+  - --label=org.opencontainers.image.url=https://git.cryptic.systems/volker.raschek/{{ .ProjectName }}
+  - --label=org.opencontainers.image.version={{ trimprefix .Tag "v" }}
+  - --platform=linux/arm64
+  - --pull
+  dockerfile: Dockerfile
+  goarch: arm64
+  goos: linux
+  image_templates:
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-arm64'
+  skip_push: false
+  use: buildx
+
+- build_flag_templates:
+  - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+  - --label=org.opencontainers.image.description={{ .ProjectName }}
+  - --label=org.opencontainers.image.documentation={{ .ProjectName }}
+  - --label=org.opencontainers.image.revision={{ .FullCommit }}
+  - --label=org.opencontainers.image.source={{ .GitURL }}
+  - --label=org.opencontainers.image.title={{ .ProjectName }}
+  - --label=org.opencontainers.image.url=https://git.cryptic.systems/volker.raschek/{{ .ProjectName }}
+  - --label=org.opencontainers.image.version={{ trimprefix .Tag "v" }}
+  - --platform=linux/riscv64
+  - --pull
+  dockerfile: Dockerfile
+  goarch: riscv64
+  goos: linux
+  image_templates:
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-riscv64'
+  skip_push: false
+  use: buildx
+
+docker_manifests:
+- name_template: 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}'
+  image_templates:
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-amd64'
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-arm-v6'
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-arm-v7'
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-arm64'
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-riscv64'
+
+gitea_urls:
+  api: https://git.cryptic.systems/api/v1
+  download: https://git.cryptic.systems
+
+version: 2

.markdownlint.yaml

@@ -45,19 +45,17 @@ 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
   tables: false
   # Include headings
   headings: true
-  # Include headings
-  headers: true
   # Strict length checking
   strict: false
   # Stern length checking
@@ -70,11 +68,6 @@ MD022:
   # Blank lines below heading
   lines_below: 1
 
-# MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
-MD024:
-  # Only check sibling headings
-  allow_different_nesting: true
-
 # MD025/single-title/single-h1 - Multiple top-level headings in the same document
 MD025:
   # Heading level

.vscode/settings.json

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

Dockerfile

@@ -1,20 +1,5 @@
-FROM docker.io/library/golang:1.20.6-alpine3.18 AS build
+FROM scratch AS build
 
-RUN apk add git make
+COPY dcmerge-* /usr/bin/dcmerge
-
-WORKDIR /workspace
-ADD ./ /workspace
-
-RUN make install \
-      DESTDIR=/cache \
-      PREFIX=/usr \
-      VERSION=${VERSION}
-
-FROM docker.io/library/alpine:3.18.2
-
-COPY --from=build /cache /
-
-WORKDIR /workspace
-VOLUME [ "/workspace" ]
 
 ENTRYPOINT [ "/usr/bin/dcmerge" ]

Makefile

@@ -26,11 +26,7 @@ DCMERGE_IMAGE_UNQUALIFIED=${DCMERGE_IMAGE_NAMESPACE}/${DCMERGE_IMAGE_NAME}:${DCM
 # ==============================================================================
 dcmerge:
 	CGO_ENABLED=0 \
-	GOPRIVATE=$(shell go env GOPRIVATE) \
 	GOPROXY=$(shell go env GOPROXY) \
-	GONOPROXY=$(shell go env GONOPROXY) \
-	GONOSUMDB=$(shell go env GONOSUMDB) \
-	GOSUMDB=$(shell go env GOSUMDB) \
 		go build -ldflags "-X 'main.version=${VERSION}'" -o ${@} main.go
 
 # CLEAN
@@ -43,14 +39,20 @@ clean:
 # ==============================================================================
 PHONY+=test/unit
 test/unit:
+	CGO_ENABLED=0 \
+	GOPROXY=$(shell go env GOPROXY) \
 		go test -v -p 1 -coverprofile=coverage.txt -covermode=count -timeout 1200s ./pkg/...
 
 PHONY+=test/integration
 test/integration:
+	CGO_ENABLED=0 \
+	GOPROXY=$(shell go env GOPROXY) \
 		go test -v -p 1 -count=1 -timeout 1200s ./it/...
 
 PHONY+=test/coverage
 test/coverage: test/unit
+	CGO_ENABLED=0 \
+	GOPROXY=$(shell go env GOPROXY) \
 		go tool cover -html=coverage.txt
 
 # GOLANGCI-LINT

README.md

@@ -1,24 +1,19 @@
 # dcmerge
 
-[![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
+`dcmerge` is a small program to merge docker-compose files from multiple sources. It is available via RPM and docker.
-sources. It is available via RPM and docker.
 
-The dynamic pattern of a docker-compose file, that for example `environments`
+The dynamic pattern of a docker-compose file, that for example `environments` can be specified as a string slice or a
-can be specified as a string slice or a list of objects is currently not
+list of objects is currently not supported. `dcmerge` expect a strict pattern layout. The `environments`, `ports` and
-supported. `dcmerge` expect a strict pattern layout. The `environments`, `ports`
+`volumes` must be declared as a slice of strings.
-and `volumes` must be declared as a slice of strings.
 
-Dockercompose file can be read-in from different sources. Currently are the
+Dockercompose file can be read-in from different sources. Currently are the following sources supported:
-following sources supported:
 
 - File
 - HTTP/HTTPS
 
-Furthermore, `dcmerge` support different ways to merge multiple docker-compose
+Furthermore, `dcmerge` support different ways to merge multiple docker-compose files.
-files.
 
 - The default merge, add missing secrets, services, networks and volumes.
 - The existing-win merge, add and protect existing attributes.
@@ -26,9 +21,8 @@ files.
 
 ## default
 
-Merge only missing secrets, services, networks and volumes without respecting
+Merge only missing secrets, services, networks and volumes **without respecting their attributes**. For example, when
-their attributes. For example, when the service `app` is already declared, it is
+the service `app` is already declared, it is not possible to add the service `app` twice. The second service will be
-not possible to add the service `app` twice. The second service will be
 completely skipped.
 
 ```yaml
@@ -68,10 +62,9 @@ services:
 
 ## existing-win
 
-The existing-win merge protects existing attributes. For example there are two
+The existing-win merge protects existing attributes. For example there are two different docker-compose files, but booth
-different docker-compose files, but booth has the same environment variable
+has the same environment variable `CLIENT_SECRET` defined with different values. The first declaration of the attribute
-`CLIENT_SECRET` defined with different values. The first declaration of the
+wins and is for overwriting protected.
-attribute wins and is for overwriting protected.
 
 ```yaml
 ---
@@ -99,9 +92,8 @@ services:
 
 ## last-win
 
-The last-win merge overwrite recursive existing attributes. For example there
+The last-win merge overwrite recursive existing attributes. For example there are two different docker-compose files,
-are two different docker-compose files, but booth has the same environment
+but booth has the same environment variable `CLIENT_SECRET` defined with different values. The last passed
-variable `CLIENT_SECRET` defined with different values. The last passed
 docker-compose file which contains this environment wins.
 
 ```yaml

cmd/root.go

@@ -8,7 +8,7 @@ import (
 	"git.cryptic.systems/volker.raschek/dcmerge/pkg/domain/dockerCompose"
 	"git.cryptic.systems/volker.raschek/dcmerge/pkg/fetcher"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 func Execute(version string) error {
@@ -18,7 +18,7 @@ func Execute(version string) error {
 		Long:                  "To load completions",
 		DisableFlagsInUseLine: true,
 		ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-		Args:                  cobra.ExactValidArgs(1),
+		Args:                  cobra.MatchAll(cobra.ExactArgs(1)),
 		Run: func(cmd *cobra.Command, args []string) {
 			switch args[0] {
 			case "bash":
@@ -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 {
@@ -91,10 +100,12 @@ func run(cmd *cobra.Command, args []string) error {
 		defer f.Close()
 
 		yamlEncoder := yaml.NewEncoder(f)
+		yamlEncoder.SetIndent(2)
 		return yamlEncoder.Encode(dockerComposeConfig)
 
 	default:
 		yamlEncoder := yaml.NewEncoder(os.Stdout)
+		yamlEncoder.SetIndent(2)
 		return yamlEncoder.Encode(dockerComposeConfig)
 	}
 

go.mod

@@ -3,15 +3,14 @@ module git.cryptic.systems/volker.raschek/dcmerge
 go 1.20
 
 require (
-	github.com/spf13/cobra v1.7.0
+	github.com/spf13/cobra v1.9.1
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.10.0
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

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.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 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,15 +6,13 @@ 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.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
-github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+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=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

manifest.tmpl

@@ -1,26 +0,0 @@
-image: git.cryptic.systems/volker.raschek/dcmerge:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
-{{#if build.tags}}
-tags:
-{{#each build.tags}}
-  - {{this}}
-{{/each}}
-  - "latest"
-{{/if}}
-manifests:
-  -
-    image: git.cryptic.systems/volker.raschek/dcmerge:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}-amd64
-    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:
-      architecture: arm64
-      os: linux
-      variant: v8

pkg/domain/dockerCompose/config_intern_test.go

@@ -0,0 +1,418 @@
+package dockerCompose
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_splitStringInPortMapping(t *testing.T) {
+	require := require.New(t)
+
+	testCases := []struct {
+		s                string
+		expectedSrc      string
+		expectedDst      string
+		expectedProtocol string
+	}{
+		{
+			s:                "53:53",
+			expectedSrc:      "53",
+			expectedDst:      "53",
+			expectedProtocol: "",
+		},
+		{
+			s:                "0.0.0.0:53:53",
+			expectedSrc:      "0.0.0.0:53",
+			expectedDst:      "53",
+			expectedProtocol: "",
+		},
+		{
+			s:                "0.0.0.0:53:10.11.12.13:53",
+			expectedSrc:      "0.0.0.0:53",
+			expectedDst:      "10.11.12.13:53",
+			expectedProtocol: "",
+		},
+		{
+			s:                "0.0.0.0:53:10.11.12.13:53/tcp",
+			expectedSrc:      "0.0.0.0:53",
+			expectedDst:      "10.11.12.13:53",
+			expectedProtocol: "tcp",
+		},
+	}
+
+	for i, testCase := range testCases {
+		actualSrc, actualDst, actualProtocol := splitStringInPortMapping(testCase.s)
+		require.Equal(testCase.expectedSrc, actualSrc, "TestCase %v", i)
+		require.Equal(testCase.expectedDst, actualDst, "TestCase %v", i)
+		require.Equal(testCase.expectedProtocol, actualProtocol, "TestCase %v", i)
+	}
+}
+
+func TestPort_DstIP(t *testing.T) {
+	require := require.New(t)
+
+	testCases := []struct {
+		s              string
+		expectedBool   bool
+		expectedString string
+	}{
+		{
+			s:              "",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:53",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:53/tcp",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:53/udp",
+			expectedBool:   false,
+			expectedString: "",
+		},
+
+		{
+			s:              "0.0.0.0:53",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:0.0.0.0:53",
+			expectedBool:   true,
+			expectedString: "0.0.0.0",
+		},
+		{
+			s:              "53:0.0.0.0:53/tcp",
+			expectedBool:   true,
+			expectedString: "0.0.0.0",
+		},
+		{
+			s:              "53:0.0.0.0:53/udp",
+			expectedBool:   true,
+			expectedString: "0.0.0.0",
+		},
+
+		{
+			s:              "10.11.12.13:53",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:10.11.12.13:53",
+			expectedBool:   true,
+			expectedString: "10.11.12.13",
+		},
+		{
+			s:              "53:10.11.12.13:53/tcp",
+			expectedBool:   true,
+			expectedString: "10.11.12.13",
+		},
+		{
+			s:              "53:10.11.12.13:53/udp",
+			expectedBool:   true,
+			expectedString: "10.11.12.13",
+		},
+	}
+
+	for i, testCase := range testCases {
+		p := Port(testCase.s)
+		require.Equal(testCase.expectedBool, p.existsDstIP(), "TestCase %v", i)
+		require.Equal(testCase.expectedString, p.getDstIP(), "TestCase %v", i)
+	}
+}
+
+func TestPort_DstPort(t *testing.T) {
+	require := require.New(t)
+
+	testCases := []struct {
+		s              string
+		expectedBool   bool
+		expectedString string
+	}{
+		{
+			s:              "",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:53",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "53:53/tcp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "53:53/udp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+
+		{
+			s:              "53:0.0.0.0:53",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "53:0.0.0.0:53/tcp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "53:0.0.0.0:53/udp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+
+		{
+			s:              "53:10.11.12.13:53",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "53:10.11.12.13:53/tcp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "53:10.11.12.13:53/udp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+	}
+
+	for i, testCase := range testCases {
+		p := Port(testCase.s)
+		require.Equal(testCase.expectedBool, p.existsDstPort(), "TestCase %v", i)
+		require.Equal(testCase.expectedString, p.getDstPort(), "TestCase %v", i)
+	}
+}
+
+func TestPort_Protocol(t *testing.T) {
+	require := require.New(t)
+
+	testCases := []struct {
+		s              string
+		expectedBool   bool
+		expectedString string
+	}{
+		{
+			s:              "0",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53/tcp",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53/udp",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:53",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:53/tcp",
+			expectedBool:   true,
+			expectedString: "tcp",
+		},
+		{
+			s:              "53:53/udp",
+			expectedBool:   true,
+			expectedString: "udp",
+		},
+		{
+			s:              "0.0.0.0:53:53/tcp",
+			expectedBool:   true,
+			expectedString: "tcp",
+		},
+		{
+			s:              "0.0.0.0:53:53/udp",
+			expectedBool:   true,
+			expectedString: "udp",
+		},
+		{
+			s:              "0.0.0.0:53:53/tcp",
+			expectedBool:   true,
+			expectedString: "tcp",
+		},
+		{
+			s:              "0.0.0.0:53:11.12.13.14:53/tcp",
+			expectedBool:   true,
+			expectedString: "tcp",
+		},
+		{
+			s:              "0.0.0.0:53:11.12.13.14:53/udp",
+			expectedBool:   true,
+			expectedString: "udp",
+		},
+	}
+
+	for i, testCase := range testCases {
+		p := Port(testCase.s)
+		require.Equal(testCase.expectedBool, p.existsProtocol(), "TestCase %v", i)
+		require.Equal(testCase.expectedString, p.getProtocol(), "TestCase %v", i)
+	}
+}
+
+func TestPort_SrcIP(t *testing.T) {
+	require := require.New(t)
+
+	testCases := []struct {
+		s              string
+		expectedBool   bool
+		expectedString string
+	}{
+		{
+			s:              "",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:53",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:53/tcp",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:53/udp",
+			expectedBool:   false,
+			expectedString: "",
+		},
+
+		{
+			s:              "0.0.0.0:53",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "0.0.0.0:53:53",
+			expectedBool:   true,
+			expectedString: "0.0.0.0",
+		},
+		{
+			s:              "0.0.0.0:53:53/tcp",
+			expectedBool:   true,
+			expectedString: "0.0.0.0",
+		},
+		{
+			s:              "0.0.0.0:53:53/udp",
+			expectedBool:   true,
+			expectedString: "0.0.0.0",
+		},
+
+		{
+			s:              "10.11.12.13:53",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "10.11.12.13:53:53",
+			expectedBool:   true,
+			expectedString: "10.11.12.13",
+		},
+		{
+			s:              "10.11.12.13:53:53/tcp",
+			expectedBool:   true,
+			expectedString: "10.11.12.13",
+		},
+		{
+			s:              "10.11.12.13:53:53/udp",
+			expectedBool:   true,
+			expectedString: "10.11.12.13",
+		},
+	}
+
+	for i, testCase := range testCases {
+		p := Port(testCase.s)
+		require.Equal(testCase.expectedBool, p.existsSrcIP(), "TestCase %v", i)
+		require.Equal(testCase.expectedString, p.getSrcIP(), "TestCase %v", i)
+	}
+}
+
+func TestPort_SrcPort(t *testing.T) {
+	require := require.New(t)
+
+	testCases := []struct {
+		s              string
+		expectedBool   bool
+		expectedString string
+	}{
+		{
+			s:              "",
+			expectedBool:   false,
+			expectedString: "",
+		},
+		{
+			s:              "53:53",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "53:53/tcp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "53:53/udp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+
+		{
+			s:              "0.0.0.0:53:53",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "0.0.0.0:53:53/tcp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "0.0.0.0:53:53/udp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+
+		{
+			s:              "10.11.12.13:53:53",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "10.11.12.13:53:53/tcp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+		{
+			s:              "10.11.12.13:53:53/udp",
+			expectedBool:   true,
+			expectedString: "53",
+		},
+	}
+
+	for i, testCase := range testCases {
+		p := Port(testCase.s)
+		require.Equal(testCase.expectedBool, p.existsSrcPort(), "TestCase %v", i)
+		require.Equal(testCase.expectedString, p.getSrcPort(), "TestCase %v", i)
+	}
+}

pkg/domain/dockerCompose/test/assets/merge/testcase000/docker-compose-000.yml

@@ -0,0 +1,6 @@
+services:
+  frontend:
+    depends_on:
+      backend:
+        condition: service_started
+    image: library/frontend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase000/docker-compose-001.yml

@@ -0,0 +1,3 @@
+services:
+  backend:
+    image: library/backend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase000/expectedResult.yml

@@ -0,0 +1,7 @@
+services:
+  backend:
+    image: library/backend:latest
+  frontend:
+    depends_on:
+    - backend
+    image: library/frontend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase001/docker-compose-000.yml

@@ -0,0 +1,5 @@
+services:
+  frontend:
+    depends_on:
+    - backend
+    image: library/frontend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase001/docker-compose-001.yml

@@ -0,0 +1,3 @@
+services:
+  backend:
+    image: library/backend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase001/expectedResult.yml

@@ -0,0 +1,7 @@
+services:
+  backend:
+    image: library/backend:latest
+  frontend:
+    depends_on:
+    - backend
+    image: library/frontend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase002/docker-compose-000.yml

@@ -0,0 +1,6 @@
+services:
+  frontend:
+    depends_on:
+      backend:
+        condition: service_completed_successfully
+    image: library/frontend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase002/docker-compose-001.yml

@@ -0,0 +1,3 @@
+services:
+  backend:
+    image: library/backend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase002/expectedResult.yml

@@ -0,0 +1,8 @@
+services:
+  backend:
+    image: library/backend:latest
+  frontend:
+    depends_on:
+      backend:
+        condition: service_completed_successfully
+    image: library/frontend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase003/docker-compose-000.yml

@@ -0,0 +1,4 @@
+services:
+  frontend:
+    command: [ "/usr/bin/cp", "--recursive", "--force", "/tmp/foo.txt", "/tmp/bar.txt" ]
+    image: library/frontend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase003/docker-compose-001.yml

@@ -0,0 +1,4 @@
+services:
+  frontend:
+    command: [ "/usr/bin/cp", "--recursive", "--force", "/tmp/bar.txt", "/tmp/foo.txt"]
+    image: library/frontend:latest

pkg/domain/dockerCompose/test/assets/merge/testcase003/expectedResult.yml

@@ -0,0 +1,9 @@
+services:
+  frontend:
+    command:
+      - /usr/bin/cp
+      - --recursive
+      - --force
+      - /tmp/foo.txt
+      - /tmp/bar.txt
+    image: library/frontend:latest

pkg/fetcher/fetcher.go

@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"git.cryptic.systems/volker.raschek/dcmerge/pkg/domain/dockerCompose"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 func Fetch(urls ...string) ([]*dockerCompose.Config, error) {
@@ -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,31 +1,10 @@
 {
   "$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:golang#master",
-    {
+    "local>volker.raschek/renovate-config:regexp#master"
-      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+  ]
-      "automerge": true,
-      "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/dcmerge", "renovate/automerge" ],
-      "automerge": false,
-      "matchPackageNames": [ "dcmerge" ],
-      "matchManagers": [ "regex" ]
-    }
-  ],
-  "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