docs(README): remove badge of drone.io

.drone.yml

@@ -0,0 +1,727 @@
+---
+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

.gitea/workflows/golang-tests.yml

@@ -4,8 +4,10 @@ on:
   pull_request:
     types: [ "opened", "reopened", "synchronize" ]
   push:
-    branches: [ '**' ]
+    branches:
-    tags-ignore: [ '**' ]
+    - '**'
+    tags-ignore:
+    - '**'
 
 jobs:
   unittest:
@@ -13,7 +15,7 @@ jobs:
     - ubuntu-latest
     steps:
     - uses: actions/checkout@v4.2.2
-    - uses: actions/setup-go@v5.5.0
+    - uses: actions/setup-go@v5.4.0
       with:
         go-version: stable
     - env:

.gitea/workflows/markdown-linters.yaml

@@ -4,14 +4,16 @@ on:
   pull_request:
     types: [ "opened", "reopened", "synchronize" ]
   push:
-    branches: [ '**' ]
+    branches:
-    tags-ignore: [ '**' ]
+    - '**'
+    tags-ignore:
+    - '**'
   workflow_dispatch: {}
 
 jobs:
   markdown-lint:
     container:
-      image: git.cryptic.systems/volker.raschek/markdownlint:0.45.0
+      image: git.cryptic.systems/volker.raschek/markdownlint:0.44.0
     runs-on:
     - ubuntu-latest
     steps:

.gitea/workflows/release.yml

@@ -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.5.0
+    - uses: actions/setup-go@v5.4.0
       with:
         go-version: stable
     - uses: docker/login-action@v3.4.0
@@ -26,7 +26,7 @@ jobs:
         GITEA_TOKEN: ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }}
         GONOSUMDB: ${{ vars.GONOSUMDB }}
         GOPROXY: ${{ vars.GOPROXY }}
-      uses: goreleaser/goreleaser-action@v6.3.0
+      uses: goreleaser/goreleaser-action@v6.2.1
       with:
         version: "~> v2"
         args: release --clean

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

@@ -1,12 +1,15 @@
 name: Update Docker Hub Description
-
 on:
   push:
-    branches: [ 'master' ]
+    branches:
-    paths: [ 'README.md' ]
+    - master
+    paths:
+    - README.md
 
 jobs:
   update-description-on-hub-docker-io:
+    needs:
+    - sync-container-image
     runs-on:
     - ubuntu-latest
     steps:
@@ -15,5 +18,5 @@ jobs:
       with:
         username: ${{ secrets.DOCKER_IO_USERNAME }}
         password: ${{ secrets.DOCKER_IO_PASSWORD }}
-        repository: volkerraschek/dcmerge
+        repository: peterevans/dockerhub-description
         readme-filepath: README.md

.goreleaser.yaml

@@ -30,7 +30,6 @@ builds:
   - amd64
   - arm
   - arm64
-  - riscv64
   goarm:
   - "6"
   - "7"
@@ -140,25 +139,6 @@ dockers:
   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:
@@ -166,7 +146,6 @@ docker_manifests:
   - '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

.markdownlint.yaml

@@ -56,6 +56,8 @@ MD013:
   tables: false
   # Include headings
   headings: true
+  # Include headings
+  headers: true
   # Strict length checking
   strict: false
   # Stern length checking
@@ -68,6 +70,11 @@ 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

manifest.tmpl

@@ -0,0 +1,20 @@
+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

pkg/domain/dockerCompose/config.go

@@ -531,7 +531,6 @@ 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"`
@@ -642,8 +641,7 @@ func (s *Service) Equal(equalable Equalable) bool {
 	case s == nil && service != nil:
 		return false
 	default:
-		return equalSlice(s.Command, service.Command) &&
+		return equalSlice(s.CapabilitiesAdd, service.CapabilitiesAdd) &&
-			equalSlice(s.CapabilitiesAdd, service.CapabilitiesAdd) &&
 			equalSlice(s.CapabilitiesDrop, service.CapabilitiesDrop) &&
 			s.DependsOnContainer.Equal(service.DependsOnContainer) &&
 			s.Deploy.Equal(service.Deploy) &&
@@ -675,7 +673,6 @@ func (s *Service) MergeExistingWin(service *Service) {
 	// 	fallthrough
 
 	default:
-		s.mergeExistingWinCommand(service.Command)
 		s.mergeExistingWinCapabilitiesAdd(service.CapabilitiesAdd)
 		s.mergeExistingWinCapabilitiesDrop(service.CapabilitiesDrop)
 		s.mergeExistingWinDependsOnContainer(service.DependsOnContainer)
@@ -710,7 +707,6 @@ func (s *Service) MergeLastWin(service *Service) {
 	// 	fallthrough
 
 	default:
-		s.mergeLastWinCommand(service.Command)
 		s.mergeLastWinCapabilitiesAdd(service.CapabilitiesAdd)
 		s.mergeLastWinCapabilitiesDrop(service.CapabilitiesDrop)
 		s.mergeLastWinDependsOnContainer(service.DependsOnContainer)
@@ -727,13 +723,6 @@ 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 {
@@ -946,12 +935,6 @@ 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 {

pkg/domain/dockerCompose/config_test.go

@@ -301,7 +301,6 @@ func TestService_Equal(t *testing.T) {
 		},
 		{
 			equalableA: &dockerCompose.Service{
-				Command:            []string{},
 				CapabilitiesAdd:    []string{},
 				CapabilitiesDrop:   []string{},
 				DependsOnContainer: &dockerCompose.DependsOnContainer{},
@@ -317,7 +316,6 @@ func TestService_Equal(t *testing.T) {
 				Volumes:            []string{},
 			},
 			equalableB: &dockerCompose.Service{
-				Command:            []string{},
 				CapabilitiesAdd:    []string{},
 				CapabilitiesDrop:   []string{},
 				DependsOnContainer: &dockerCompose.DependsOnContainer{},
@@ -334,15 +332,6 @@ 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"},
@@ -647,52 +636,6 @@ 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{
@@ -1677,52 +1620,6 @@ 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{

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

@@ -1,4 +0,0 @@
-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

@@ -1,4 +0,0 @@
-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

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