fix(Dockerfile): respect target platform

The following patch adjusts the Goreleaser configuration to build ARMv5 binaries
as well as container images. It also replaces docker and docker_manifest with
docker_v2.

Goreleaser has also been extended to generate SBOM files in cdx and spdx format.

.gitea/workflows/golang-linters.yaml

@@ -20,10 +20,10 @@ jobs:
         go: [ stable ]
         os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
     steps:
-    - uses: actions/checkout@v6.0.1
-    - uses: actions/setup-go@v6.1.0
+    - uses: actions/checkout@v6.0.2
+    - uses: actions/setup-go@v6.2.0
       with:
         go-version: ${{ matrix.go }}
     - uses: golangci/golangci-lint-action@v9.2.0
       with:
-        version: v2.7.2 # renovate: datasource=github-releases depName=golangci/golangci-lint
+        version: v2.8.0 # renovate: datasource=github-releases depName=golangci/golangci-lint

.gitea/workflows/golang-tests.yaml

@@ -33,8 +33,8 @@ jobs:
         go: [ stable ]
         os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
     steps:
-    - uses: actions/checkout@v6.0.1
-    - uses: actions/setup-go@v6.1.0
+    - uses: actions/checkout@v6.0.2
+    - uses: actions/setup-go@v6.2.0
       with:
         go-version: ${{ matrix.go }}
     - env:

.gitea/workflows/markdown-linters.yaml

@@ -13,7 +13,7 @@ jobs:
     name: "Run markdown linter"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6.0.1
+    - uses: actions/checkout@v6.0.2
     - uses: DavidAnson/markdownlint-cli2-action@v21.0.0
       with:
         globs: '**/*.md'

.gitea/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: "Release"
+name: Release
 
 on:
   push:
@@ -12,11 +12,28 @@ jobs:
     name: "Release application"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6.0.1
+    - uses: actions/checkout@v6.0.2
       with:
         fetch-depth: 0
+    - name: Install curl
+      run: apt-get update && apt-get install --yes curl
+    - name: Install syft
+      env:
+        SYFT_VERSION: "1.41.1" # renovate: datasource=github-releases depName=anchore/syft
+      run: |
+        OS="$(uname | tr '[:upper:]' '[:lower:]')"
+        ARCH="$(dpkg --print-architecture)"
+        curl \
+          --fail \
+          --location \
+          --silent \
+          --output syft_${SYFT_VERSION}_${OS}_${ARCH}.deb \
+            "https://github.com/anchore/syft/releases/download/v${SYFT_VERSION}/syft_${SYFT_VERSION}_${OS}_${ARCH}.deb"
+        dpkg -i syft_${SYFT_VERSION}_${OS}_${ARCH}.deb
+        rm syft_${SYFT_VERSION}_${OS}_${ARCH}.deb
     - uses: docker/setup-qemu-action@v3.7.0
-    - uses: actions/setup-go@v6.1.0
+    - uses: docker/setup-buildx-action@v3.12.0
+    - uses: actions/setup-go@v6.2.0
       with:
         go-version: stable
     - uses: docker/login-action@v3.6.0
@@ -30,7 +47,7 @@ jobs:
         GOPROXY: ${{ vars.GOPROXY }}
       uses: goreleaser/goreleaser-action@v6.4.0
       with:
-        version: v2.13.1 # renovate: datasource=github-releases depName=goreleaser/goreleaser
+        version: v2.13.3 # renovate: datasource=github-releases depName=goreleaser/goreleaser
         args: release --clean
 
   sync-to-hub-docker-io:

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

@@ -10,7 +10,7 @@ jobs:
   update-description-on-hub-docker-io:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6.0.1
+    - uses: actions/checkout@v6.0.2
     - uses: peter-evans/dockerhub-description@v5.0.0
       with:
         username: ${{ secrets.DOCKER_IO_USERNAME }}

.goreleaser.yaml

@@ -1,7 +1,17 @@
 project_name: dcmerge
 
 archives:
-- formats: [ "tar.xz" ]
+- id: archives
+  formats:
+  - tar.xz
+  name_template: >-
+    {{ .ProjectName }}-
+    {{- .Version }}-
+    {{- .Os }}-
+    {{- if eq .Arch "amd64" }}amd64
+    {{- else if eq .Arch "amd64_v1" }}amd64
+    {{- else }}{{ .Arch }}{{ end }}
+    {{- if .Arm }}-{{ .Arm }}{{ end }}
   files:
   - README.md
   - LICENSE
@@ -11,15 +21,9 @@ before:
   - 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 }}
+- id: dcmerge
+  main: main.go
+  binary: dcmerge
   env:
   - CGO_ENABLED=0
   - GONOSUMDB={{ .Env.GONOSUMDB }}
@@ -32,17 +36,19 @@ builds:
   - arm64
   - riscv64
   goarm:
+  - "5"
   - "6"
   - "7"
   flags:
   - -trimpath
+  - -mod=readonly
+  - -modcacherw
   ldflags:
-  - -s -w -X 'main.version={{ trimprefix .Tag "v" }}'
+  - -s -w -X 'main.version={{ .Version }}'
 
 changelog:
   filters:
     exclude:
-    - '^chore'
     - '^docs'
     - '^test'
     - Merge pull request
@@ -56,117 +62,254 @@ changelog:
   - title: "Bug fixes"
     regexp: '^.*?fix(\([[:word:]]+\))??!?:.+$'
     order: 1
+  - title: Dependencies
+    regexp: '^.*?chore\(deps\):.+$'
+    order: 2
   - 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
+dockers_v2:
+- # ID of the image, needed if you want to filter by it later on (e.g. on custom publishers).
+  # Default: project name
+  id: container-images
 
-- 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
+  # Path to the Dockerfile (from the project root).
+  dockerfile: Dockerfile.scratch
 
-- 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
+  # IDs to filter the binaries/packages.
+  #
+  # Make sure to only include the IDs of binaries you want to `COPY` in your
+  # Dockerfile.
+  #
+  # If you include IDs that don't exist or are not available for the current
+  # architecture being built, the build of the image will be skipped.
+  ids:
+  - dcmerge
 
-- 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
+  # Annotations to be added to the image.
+  annotations:
+    org.opencontainers.image.authors: "Volker Raschek"
+    org.opencontainers.image.created: "{{ .Date }}"
+    org.opencontainers.image.description: "{{ .ProjectName }}"
+    org.opencontainers.image.documentation: "{{ .ProjectName }}"
+    org.opencontainers.image.licenses: "MIT"
+    org.opencontainers.image.revision: "{{ .FullCommit }}"
+    org.opencontainers.image.source: "{{ .GitURL }}"
+    org.opencontainers.image.title: "{{ .ProjectName }}"
+    org.opencontainers.image.url: "https://git.cryptic.systems/volker.raschek/{{ .ProjectName }}"
+    org.opencontainers.image.vendor: "Volker Raschek"
+    org.opencontainers.image.version: "{{ .Version }}"
 
-- 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
+    io.artifacthub.package.alternative-locations: "docker.io/volkerraschek/{{ .ProjectName }}:{{ .Version }}"
+    io.artifacthub.package.keywords: "docker,docker-compose,merge,ci"
+    io.artifacthub.package.license: "MIT"
+    io.artifacthub.package.readme-url: "https://git.cryptic.systems/volker.raschek/{{ .ProjectName }}/raw/tag/v{{ .Version }}/README.md"
 
-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'
+  labels: {}
+
+  images:
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}'
+
+  # Platforms to build.
+  platforms:
+  - linux/amd64
+  - linux/arm/v5
+  - linux/arm/v6
+  - linux/arm/v7
+  - linux/arm64
+  - linux/riscv64
+
+  # Whether to create and attach a SBOM to the image.
+  sbom: "{{ not .IsNightly }}"
+
+  # Tag names.
+  #
+  # Empty tags are ignored.
+  tags:
+  - "{{ .Version }}"
+  - "{{ if .IsNightly }}nightly{{ end }}"
+  - "{{ if not .IsNightly }}latest{{ end }}"
+
+# RPM packages
+nfpms:
+- id: nfpms
+  ids:
+  - dcmerge
+  package_name: dcmerge
+  file_name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{- if .Arm }}-{{ .Arm }}{{ end }}"
+  vendor: "Volker Raschek"
+  homepage: "https://git.cryptic.systems/volker.raschek/{{ .ProjectName }}"
+  maintainer: "Volker Raschek <volker.raschek@cryptic.systems>"
+  description: |-
+    dcmerge is a tool to merge docker-compose files from multiple resources.
+    It supports merging local files and remote files via HTTP/HTTPS.
+  license: MIT
+  formats:
+  - deb
+  - rpm
+  dependencies:
+  - git
+  recommends:
+  - docker-compose
+  suggests:
+  - docker
+  bindir: /usr/bin
+  contents:
+  - src: ./README.md
+    dst: "/usr/share/doc/{{ .ProjectName }}/README.md"
+    file_info:
+      mode: 0644
+  # License
+  - src: ./LICENSE
+    dst: "/usr/share/doc/{{ .ProjectName }}/LICENSE"
+    file_info:
+      mode: 0644
+  - src: ./LICENSE
+    dst: "/usr/share/licenses/{{ .ProjectName }}/LICENSE"
+    file_info:
+      mode: 0644
+  # Create man page directory
+  - dst: /usr/share/man/man1
+    type: dir
+    file_info:
+      mode: 0755
+  rpm:
+    group: Development/Tools
+    summary: Tool to merge docker-compose files from multiple resources
+    compression: xz
+  deb:
+    lintian_overrides:
+    - statically-linked-binary
+    - changelog-file-missing-in-native-package
+
+sboms:
+- # ID of the sbom config, must be unique.
+  #
+  # Default: 'default'.
+  id: sboms-cyclonedx
+
+  # IDs of the artifacts to catalog.
+  #
+  # If `artifacts` is "source" or "any" then this fields has no effect.
+  ids:
+  - dcmerge
+
+  # Which artifacts to catalog.
+  #
+  # Valid options are:
+  # - any:        let the SBOM tool decide which artifacts available in
+  #               the cwd should be cataloged
+  # - source:     source archive
+  # - package:    Linux packages (deb, rpm, apk, etc)
+  # - installer:  Windows MSI installers (Pro only)
+  # - diskimage:  macOS DMG disk images (Pro only)
+  # - archive:    archives from archive pipe
+  # - binary:     binaries output from the build stage
+  #
+  # Default: 'archive'.
+  artifacts: binary
+
+  # List of names of the SBOM documents created at this step
+  # (relative to the dist dir).
+  #
+  # Each element configured is made available as variables. For example:
+  #   documents: ["foo", "bar"]
+  #
+  # would make the following variables that can be referenced as template keys:
+  #   document0: "foo"
+  #   document1: "bar"
+  #
+  # Note that multiple sbom values are only allowed if the value of
+  # "artifacts" is "any".
+  #
+  # Default:
+  #   When "binary":   ["{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.sbom.json"]
+  #   When "any":      []
+  #   Otherwise:       ["{{ .ArtifactName }}.sbom.json"]
+  # Templates: allowed.
+  documents:
+  - "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{- if .Arm }}-{{ .Arm }}{{ end }}.cdx.json"
+
+  # Path to the SBOM generator command
+  #
+  # Note: the process CWD will be set to the same location as "dist"
+  #
+  # Default: 'syft'.
+  cmd: syft
+
+  # Command line arguments for the command
+  #
+  # Default: ["$artifact", "--output", "spdx-json=$document", "--enrich", "all"].
+  # Templates: allowed.
+  args:
+  - "$artifact"
+  - "--enrich=all"
+  - "--output=cyclonedx-json=$document"
+
+- # ID of the sbom config, must be unique.
+  #
+  # Default: 'default'.
+  id: sboms-spdx
+
+  # IDs of the artifacts to catalog.
+  #
+  # If `artifacts` is "source" or "any" then this fields has no effect.
+  ids:
+  - dcmerge
+
+  # Which artifacts to catalog.
+  #
+  # Valid options are:
+  # - any:        let the SBOM tool decide which artifacts available in
+  #               the cwd should be cataloged
+  # - source:     source archive
+  # - package:    Linux packages (deb, rpm, apk, etc)
+  # - installer:  Windows MSI installers (Pro only)
+  # - diskimage:  macOS DMG disk images (Pro only)
+  # - archive:    archives from archive pipe
+  # - binary:     binaries output from the build stage
+  #
+  # Default: 'archive'.
+  artifacts: binary
+
+  # List of names of the SBOM documents created at this step
+  # (relative to the dist dir).
+  #
+  # Each element configured is made available as variables. For example:
+  #   documents: ["foo", "bar"]
+  #
+  # would make the following variables that can be referenced as template keys:
+  #   document0: "foo"
+  #   document1: "bar"
+  #
+  # Note that multiple sbom values are only allowed if the value of
+  # "artifacts" is "any".
+  #
+  # Default:
+  #   When "binary":   ["{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}.sbom.json"]
+  #   When "any":      []
+  #   Otherwise:       ["{{ .ArtifactName }}.sbom.json"]
+  # Templates: allowed.
+  documents:
+  - "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{- if .Arm }}-{{ .Arm }}{{ end }}.spdx.json"
+
+  # Path to the SBOM generator command
+  #
+  # Note: the process CWD will be set to the same location as "dist"
+  #
+  # Default: 'syft'.
+  cmd: syft
+
+  # Command line arguments for the command
+  #
+  # Default: ["$artifact", "--output", "spdx-json=$document", "--enrich", "all"].
+  # Templates: allowed.
+  args:
+  - "$artifact"
+  - "--enrich=all"
+  - "--output=spdx-json=$document"
 
 gitea_urls:
   api: https://git.cryptic.systems/api/v1

Dockerfile

@@ -1,5 +0,0 @@
-FROM scratch AS build
-
-COPY dcmerge-* /usr/bin/dcmerge
-
-ENTRYPOINT [ "/usr/bin/dcmerge" ]

Dockerfile.scratch

@@ -0,0 +1,4 @@
+FROM scratch AS build
+ARG TARGETPLATFORM
+COPY "${TARGETPLATFORM}/dcmerge" "/usr/bin/dcmerge"
+ENTRYPOINT [ "/usr/bin/dcmerge" ]

README.md

@@ -1,5 +1,6 @@
 # dcmerge
 
+[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/dcmerge)](https://artifacthub.io/packages/search?repo=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.

artifacthub-repo.yml

@@ -0,0 +1,3 @@
+repositoryID: 2a061ce3-fe96-4fbe-b053-eccdb63001bc
+owners:
+- name: Volker Raschek

cmd/root.go

@@ -55,7 +55,7 @@ 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)
+		return fmt.Errorf("failed to parse flag existing-win: %s", err)
 	}
 
 	mergeLastWin, err := cmd.Flags().GetBool("last-win")
@@ -78,7 +78,7 @@ func run(cmd *cobra.Command, args []string) error {
 	for _, config := range dockerComposeConfigs {
 		switch {
 		case mergeExisting && mergeLastWin:
-			return fmt.Errorf("neither --first-win or --last-win can be specified - not booth")
+			return fmt.Errorf("neither --existing-win or --last-win can be specified - not booth")
 		case mergeExisting && !mergeLastWin:
 			dockerComposeConfig.MergeExistingWin(config)
 		case !mergeExisting && mergeLastWin:

pkg/domain/dockerCompose/config.go

@@ -182,7 +182,7 @@ func (c *Config) mergeExistingWinSecrets(secrets map[string]*Secret) {
 			continue
 		}
 
-		if c.ExistsNetwork(secretName) {
+		if c.ExistsSecret(secretName) {
 			c.Secrets[secretName].MergeExistingWin(secret)
 		} else {
 			c.Secrets[secretName] = secret
@@ -210,7 +210,7 @@ func (c *Config) mergeExistingWinVolumes(volumes map[string]*Volume) {
 			continue
 		}
 
-		if c.ExistsNetwork(volumeName) {
+		if c.ExistsVolume(volumeName) {
 			c.Volumes[volumeName].MergeExistingWin(volume)
 		} else {
 			c.Volumes[volumeName] = volume