feat: support service.command

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.
style(markdown): adapt configuration
2025-05-22 09:49:43 +02:00 · 2025-05-13 17:53:33 +02:00 · 2025-05-08 14:51:15 +02:00 · 2025-05-08 04:03:00 +00:00 · 2025-05-06 22:03:33 +00:00 · 2025-04-14 19:07:57 +00:00
14 changed files with 214 additions and 770 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,727 +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.4.0
-
- name: markdown lint
-  commands:
-  - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.44.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.5
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-    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.24.2
-
-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.24.2
-
-trigger:
-  event:
-    include:
-    - pull_request
-    - push
-    exclude:
-    - tag
-
---
-kind: pipeline
-type: docker
-name: dry-run-amd64
-
-clone:
-  disable: true
-
-depends_on:
- linter
- unit-test-amd64
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
- name: build
-  image: docker.io/plugins/docker:20.18.8
-  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.5
-  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
- unit-test-arm64
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
- name: build
-  image: docker.io/plugins/docker:20.18.8
-  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.5
-  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
- unit-test-amd64
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
- name: build
-  image: docker.io/plugins/docker:20.18.8
-  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.5
-  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
- unit-test-arm64
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
-
- name: build
-  image: docker.io/plugins/docker:20.18.8
-  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.5
-  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-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.4.0
-
- 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.5
-  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.4.0
-
- 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.18.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.5
-  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.4.0
-
- name: build
-  image: docker.io/plugins/docker:20.18.8
-  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.5
-  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.4.0
-
- name: build
-  image: docker.io/plugins/docker:20.18.8
-  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.5
-  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-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.4.0
-
- 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.5
-  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.4.0
-
- 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.18.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.5
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-  - tag
-  repo:
-  - volker.raschek/dcmerge
--- a/.gitea/workflows/golang-tests.yaml
+++ b/.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
--- a/.gitea/workflows/markdown-linters.yaml
+++ b/.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.44.0
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - name: Lint Markdown files
+      run: markdownlint --config .markdownlint.yaml .
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@ -2,7 +2,7 @@ name: Release

 on:
  push:
-    tags: [ "*" ]
+    tags: [ '**' ]

 permissions:
  contents: write
@ -14,7 +14,7 @@ jobs:
    steps:
    - uses: actions/checkout@v4.2.2
    - uses: docker/setup-qemu-action@v3.6.0
-    - uses: actions/setup-go@v5.4.0
+    - uses: actions/setup-go@v5.5.0
      with:
        go-version: stable
    - uses: docker/login-action@v3.4.0
@ -26,13 +26,14 @@ jobs:
        GITEA_TOKEN: ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }}
        GONOSUMDB: ${{ vars.GONOSUMDB }}
        GOPROXY: ${{ vars.GOPROXY }}
-      uses: goreleaser/goreleaser-action@v6.2.1
+      uses: goreleaser/goreleaser-action@v6.3.0
      with:
        version: "~> v2"
        args: release --clean

-  sync-container-image:
-    needs: release
+  sync-to-hub-docker-io:
+    needs:
+    - release
    runs-on: ubuntu-latest
    steps:
    - name: Copy images to docker.io
@ -47,5 +48,5 @@ jobs:
          --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-goreleaser:${TAG} \
-            docker://docker.io/volkerraschek/dcmerge-goreleaser:${TAG}
+            docker://git.cryptic.systems/volker.raschek/dcmerge:${TAG} \
+            docker://docker.io/volkerraschek/dcmerge:${TAG}
--- a/.gitea/workflows/update-docker-hub-description.yaml
+++ b/.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
--- a/.markdownlint.yaml
+++ b/.markdownlint.yaml
@ -56,8 +56,6 @@ MD013:
  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
--- a/16
+++ b/16
@ -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,15 +39,21 @@ clean:
 # ==============================================================================
 PHONY+=test/unit
 test/unit:
-	go test -v -p 1 -coverprofile=coverage.txt -covermode=count -timeout 1200s ./pkg/...
+	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:
-	go test -v -p 1 -count=1 -timeout 1200s ./it/...
+	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
-	go tool cover -html=coverage.txt
+	CGO_ENABLED=0 \
+	GOPROXY=$(shell go env GOPROXY) \
+		go tool cover -html=coverage.txt

 # GOLANGCI-LINT
 # ==============================================================================
--- a/README.md
+++ b/README.md
@ -1,6 +1,5 @@
 # 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 sources. It is available via RPM and docker.
--- a/manifest.tmpl
+++ b/manifest.tmpl
@ -1,20 +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}}-arm64-v8
-    platform:
-      architecture: arm64
-      os: linux
-      variant: v8
--- a/pkg/domain/dockerCompose/config.go
+++ b/pkg/domain/dockerCompose/config.go
@ -531,6 +531,7 @@ func NewSecret() *Secret {
 }

 type Service struct {
+	Command            []string                   `json:"command,omitempty" yaml:"command,omitempty"`
 	CapabilitiesAdd    []string                   `json:"cap_add,omitempty" yaml:"cap_add,omitempty"`
 	CapabilitiesDrop   []string                   `json:"cap_drop,omitempty" yaml:"cap_drop,omitempty"`
 	DependsOnContainer *DependsOnContainer        `json:"depends_on,omitempty" yaml:"depends_on,omitempty"`
@ -641,7 +642,8 @@ func (s *Service) Equal(equalable Equalable) bool {
 	case s == nil && service != nil:
 		return false
 	default:
-		return equalSlice(s.CapabilitiesAdd, service.CapabilitiesAdd) &&
+		return equalSlice(s.Command, service.Command) &&
+			equalSlice(s.CapabilitiesAdd, service.CapabilitiesAdd) &&
 			equalSlice(s.CapabilitiesDrop, service.CapabilitiesDrop) &&
 			s.DependsOnContainer.Equal(service.DependsOnContainer) &&
 			s.Deploy.Equal(service.Deploy) &&
@ -673,6 +675,7 @@ func (s *Service) MergeExistingWin(service *Service) {
 	// 	fallthrough

 	default:
+		s.mergeExistingWinCommand(service.Command)
 		s.mergeExistingWinCapabilitiesAdd(service.CapabilitiesAdd)
 		s.mergeExistingWinCapabilitiesDrop(service.CapabilitiesDrop)
 		s.mergeExistingWinDependsOnContainer(service.DependsOnContainer)
@ -707,6 +710,7 @@ func (s *Service) MergeLastWin(service *Service) {
 	// 	fallthrough

 	default:
+		s.mergeLastWinCommand(service.Command)
 		s.mergeLastWinCapabilitiesAdd(service.CapabilitiesAdd)
 		s.mergeLastWinCapabilitiesDrop(service.CapabilitiesDrop)
 		s.mergeLastWinDependsOnContainer(service.DependsOnContainer)
@ -723,6 +727,13 @@ func (s *Service) MergeLastWin(service *Service) {
 	}
 }

+func (s *Service) mergeExistingWinCommand(command []string) {
+	if len(s.Command) > 0 {
+		return
+	}
+	s.Command = command
+}
+
 func (s *Service) mergeExistingWinCapabilitiesAdd(capabilitiesAdd []string) {
 	for _, capabilityAdd := range capabilitiesAdd {
 		if !existsInSlice(s.CapabilitiesAdd, capabilityAdd) && len(capabilityAdd) > 0 {
@ -935,6 +946,12 @@ func (s *Service) mergeExistingWinVolumes(volumes []string) {
 	}
 }

+func (s *Service) mergeLastWinCommand(command []string) {
+	if len(command) > 0 {
+		s.Command = command
+	}
+}
+
 func (s *Service) mergeLastWinCapabilitiesAdd(capabilitiesAdd []string) {
 	for _, capabilityAdd := range capabilitiesAdd {
 		if len(capabilityAdd) <= 0 {
--- a/pkg/domain/dockerCompose/config_test.go
+++ b/pkg/domain/dockerCompose/config_test.go
@ -301,6 +301,7 @@ func TestService_Equal(t *testing.T) {
 		},
 		{
 			equalableA: &dockerCompose.Service{
+				Command:            []string{},
 				CapabilitiesAdd:    []string{},
 				CapabilitiesDrop:   []string{},
 				DependsOnContainer: &dockerCompose.DependsOnContainer{},
@ -316,6 +317,7 @@ func TestService_Equal(t *testing.T) {
 				Volumes:            []string{},
 			},
 			equalableB: &dockerCompose.Service{
+				Command:            []string{},
 				CapabilitiesAdd:    []string{},
 				CapabilitiesDrop:   []string{},
 				DependsOnContainer: &dockerCompose.DependsOnContainer{},
@ -332,6 +334,15 @@ func TestService_Equal(t *testing.T) {
 			},
 			expectedResult: true,
 		},
+		{
+			equalableA: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			equalableB: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			expectedResult: true,
+		},
 		{
 			equalableA: &dockerCompose.Service{
 				CapabilitiesAdd: []string{"NET_ADMIN"},
@ -636,6 +647,52 @@ func TestService_MergeExistingWin(t *testing.T) {
 			expectedService:    &dockerCompose.Service{},
 		},

+		// Command
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Command: []string{},
+			},
+			expectedService: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+		},
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Command: []string{},
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			expectedService: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+		},
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			expectedService: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+		},
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Command: []string{""},
+			},
+			expectedService: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+		},
+
 		// CapabilitiesAdd
 		{
 			serviceDeploymentA: &dockerCompose.Service{
@ -1620,6 +1677,52 @@ func TestService_MergeLastWin(t *testing.T) {
 			expectedService:    &dockerCompose.Service{},
 		},

+		// Command
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Command: []string{},
+			},
+			expectedService: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+		},
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Command: []string{},
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			expectedService: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+		},
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			expectedService: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+		},
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Command: []string{"/usr/bin/cp", "--recursive", "/tmp/foo.txt", "/tmp/bar.txt"},
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Command: []string{""},
+			},
+			expectedService: &dockerCompose.Service{
+				Command: []string{""},
+			},
+		},
+
 		// CapabilitiesAdd
 		{
 			serviceDeploymentA: &dockerCompose.Service{
--- a/pkg/domain/dockerCompose/test/assets/merge/testcase003/docker-compose-000.yml
+++ b/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
--- a/pkg/domain/dockerCompose/test/assets/merge/testcase003/docker-compose-001.yml
+++ b/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
--- a/pkg/domain/dockerCompose/test/assets/merge/testcase003/expectedResult.yml
+++ b/pkg/domain/dockerCompose/test/assets/merge/testcase003/expectedResult.yml
@ -0,0 +1,8 @@
+services:
+  backend:
+    image: library/backend:latest
+  frontend:
+    depends_on:
+      backend:
+        condition: service_completed_successfully
+    image: library/frontend:latest
Author	SHA1	Message	Date
Markus Pesch	e30c7c007f	feat: support service.command Some checks failed Markdown linter / markdown-lint (push) Successful in 3s Details Release / release (push) Successful in 1m24s Details Release / sync-to-hub-docker-io (push) Successful in 28s Details Golang Tests / unittest (push) Failing after 2m48s Details 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.	2025-05-22 09:49:43 +02:00
Markus Pesch	973e90986c	style(markdown): adapt configuration All checks were successful Markdown linter / markdown-lint (push) Successful in 8s Details Golang Tests / unittest (push) Successful in 29s Details	2025-05-13 17:53:33 +02:00
Markus Pesch	90a6350a02	fix(drone): remove configuration All checks were successful Golang Tests / unittest (push) Successful in 22s Details Markdown linter / markdown-lint (push) Successful in 10s Details	2025-05-08 14:51:15 +02:00
CSRBot	89f4f5b0fa	chore(deps): update actions/setup-go action to v5.5.0 All checks were successful Golang Tests / unittest (pull_request) Successful in 2m40s Details Markdown linter / markdown-lint (pull_request) Successful in 11s Details Markdown linter / markdown-lint (push) Successful in 7s Details Golang Tests / unittest (push) Successful in 24s Details	2025-05-08 04:03:00 +00:00
CSRBot	ee1474a506	chore(deps): update docker.io/library/golang docker tag to v1.24.3 All checks were successful Markdown linter / markdown-lint (pull_request) Successful in 11s Details Golang Tests / unittest (pull_request) Successful in 2m28s Details Markdown linter / markdown-lint (push) Successful in 8s Details Golang Tests / unittest (push) Successful in 31s Details	2025-05-06 22:03:33 +00:00
CSRBot	1d33b165eb	chore(deps): update goreleaser/goreleaser-action action to v6.3.0 All checks were successful Golang Tests / unittest (pull_request) Successful in 47s Details Markdown linter / markdown-lint (pull_request) Successful in 11s Details Golang Tests / unittest (push) Successful in 45s Details Markdown linter / markdown-lint (push) Successful in 12s Details	2025-04-14 19:07:57 +00:00
Markus Pesch	6fb289da71	docs(README): remove badge of drone.io All checks were successful Golang Tests / unittest (push) Successful in 41s Details Markdown linter / markdown-lint (push) Successful in 16s Details Update Docker Hub Description / update-description-on-hub-docker-io (push) Successful in 16s Details	2025-04-14 19:51:56 +02:00
Markus Pesch	ed0b94e4b8	fix(ci): select correct repository on hub.docker.io Some checks are pending Golang Tests / unittest (push) Waiting to run Details Markdown linter / markdown-lint (push) Waiting to run Details Update Docker Hub Description / update-description-on-hub-docker-io (push) Waiting to run Details	2025-04-14 19:51:23 +02:00
Markus Pesch	5f06edff04	chore(ci): use '.yaml' extension	2025-04-14 19:51:23 +02:00
Markus Pesch	5560d13550	feat(ci): sync description on hub.docker.io Some checks failed Markdown linter / markdown-lint (push) Waiting to run Details Golang Tests / unittest (push) Has been cancelled Details Update Docker Hub Description / update-description-on-hub-docker-io (push) Failing after 10s Details	2025-04-14 19:45:41 +02:00
Markus Pesch	6387e972e3	chore(ci): add golang tests All checks were successful Golang Tests / unittest (push) Successful in 42s Details Markdown linter / markdown-lint (push) Successful in 12s Details	2025-04-14 19:29:09 +02:00
Markus Pesch	5eec7fc1a5	chore(ci): add markdownlinter All checks were successful Markdown linter / markdown-lint (push) Successful in 8s Details	2025-04-14 19:20:12 +02:00
Markus Pesch	0688315658	chore(ci): remove suffix All checks were successful Release / release (push) Successful in 1m52s Details Release / sync-container-image (push) Successful in 48s Details	2025-04-14 19:17:56 +02:00