3 Commits

Author SHA1 Message Date
02ae924b02 fix(Dockerfile): respect target platform
All checks were successful
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-amd64) (push) Successful in 16s
Run Golang tests / Run unit tests (stable, ubuntu-latest-amd64) (push) Successful in 11s
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-arm64) (push) Successful in 32s
Lint Markdown files / Run markdown linter (push) Successful in 5s
Run Golang tests / Run unit tests (stable, ubuntu-latest-arm64) (push) Successful in 24s
Release / Release application (push) Successful in 4m19s
Release / Upload Images to docker.io (push) Successful in 1m2s
2026-01-31 23:13:20 +01:00
df8b3b4a8b fix(goreleaser): add dependency updates in changelog
All checks were successful
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-amd64) (push) Successful in 12s
Run Golang tests / Run unit tests (stable, ubuntu-latest-amd64) (push) Successful in 9s
Lint Markdown files / Run markdown linter (push) Successful in 4s
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-arm64) (push) Successful in 30s
Run Golang tests / Run unit tests (stable, ubuntu-latest-arm64) (push) Successful in 22s
2026-01-31 22:56:52 +01:00
c40b83e42a docs(README): add badge from ArtifactHub
All checks were successful
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-amd64) (push) Successful in 10s
Run Golang tests / Run unit tests (stable, ubuntu-latest-amd64) (push) Successful in 7s
Lint Markdown files / Run markdown linter (push) Successful in 4s
Update Docker Hub Description / update-description-on-hub-docker-io (push) Successful in 5s
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-arm64) (push) Successful in 31s
Run Golang tests / Run unit tests (stable, ubuntu-latest-arm64) (push) Successful in 22s
2026-01-31 22:51:54 +01:00
3 changed files with 7 additions and 5 deletions

View File

@@ -49,7 +49,6 @@ builds:
changelog: changelog:
filters: filters:
exclude: exclude:
- '^chore'
- '^docs' - '^docs'
- '^test' - '^test'
- Merge pull request - Merge pull request
@@ -63,6 +62,9 @@ changelog:
- title: "Bug fixes" - title: "Bug fixes"
regexp: '^.*?fix(\([[:word:]]+\))??!?:.+$' regexp: '^.*?fix(\([[:word:]]+\))??!?:.+$'
order: 1 order: 1
- title: Dependencies
regexp: '^.*?chore\(deps\):.+$'
order: 2
- title: Others - title: Others
order: 999 order: 999
sort: asc sort: asc
@@ -143,7 +145,7 @@ nfpms:
description: |- description: |-
dcmerge is a tool to merge docker-compose files from multiple resources. dcmerge is a tool to merge docker-compose files from multiple resources.
It supports merging local files and remote files via HTTP/HTTPS. It supports merging local files and remote files via HTTP/HTTPS.
license: Apache 2.0 license: MIT
formats: formats:
- deb - deb
- rpm - rpm

View File

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

View File

@@ -1,5 +1,6 @@
# dcmerge # 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) [![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/dcmerge)](https://hub.docker.com/r/volkerraschek/dcmerge)
`dcmerge` is a small program to merge docker-compose files from multiple sources. It is available via RPM and docker. `dcmerge` is a small program to merge docker-compose files from multiple sources. It is available via RPM and docker.