volker.raschek/dcmerge-goreleaser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

fix: rename go dcmerge-goreleaser

Browse Source
This commit is contained in:
Markus Pesch
2025-02-15 22:51:30 +01:00
parent c8894de28c
commit 6ba89ef2dc
12 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore
View File

@@ -1 +1 @@
dcmerge
dcmerge-goreleaser

36
.drone.yml
View File

@@ -134,7 +134,7 @@ steps:
mirror:
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/dcmerge
repo: git.cryptic.systems/volker.raschek/dcmerge-goreleaser
tags: latest-amd64
username:
from_secret: git_cryptic_systems_container_registry_user
@@ -167,7 +167,7 @@ trigger:
- pull_request
- push
repo:
- volker.raschek/dcmerge
- volker.raschek/dcmerge-goreleaser
---
kind: pipeline
@@ -201,7 +201,7 @@ steps:
mirror:
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/dcmerge
repo: git.cryptic.systems/volker.raschek/dcmerge-goreleaser
tags: latest-arm64-v8
username:
from_secret: git_cryptic_systems_container_registry_user
@@ -234,7 +234,7 @@ trigger:
- pull_request
- push
repo:
- volker.raschek/dcmerge
- volker.raschek/dcmerge-goreleaser
---
kind: pipeline
@@ -267,7 +267,7 @@ steps:
mirror:
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/dcmerge
repo: git.cryptic.systems/volker.raschek/dcmerge-goreleaser
tags: latest-amd64
username:
from_secret: git_cryptic_systems_container_registry_user
@@ -299,7 +299,7 @@ trigger:
- cron
- push
repo:
- volker.raschek/dcmerge
- volker.raschek/dcmerge-goreleaser
---
kind: pipeline
@@ -332,7 +332,7 @@ steps:
mirror:
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/dcmerge
repo: git.cryptic.systems/volker.raschek/dcmerge-goreleaser
tags: latest-arm64-v8
username:
from_secret: git_cryptic_systems_container_registry_user
@@ -364,7 +364,7 @@ trigger:
- cron
- push
repo:
- volker.raschek/dcmerge
- volker.raschek/dcmerge-goreleaser
---
kind: pipeline
@@ -427,7 +427,7 @@ trigger:
- cron
- push
repo:
- volker.raschek/dcmerge
- volker.raschek/dcmerge-goreleaser
---
kind: pipeline
@@ -446,7 +446,7 @@ steps:
- 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
- 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-goreleaser docker.io/volkerraschek
environment:
SRC_CRED_USERNAME:
from_secret: git_cryptic_systems_container_registry_user
@@ -487,7 +487,7 @@ trigger:
- cron
- push
repo:
- volker.raschek/dcmerge
- volker.raschek/dcmerge-goreleaser
---
kind: pipeline
@@ -517,7 +517,7 @@ steps:
mirror:
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/dcmerge
repo: git.cryptic.systems/volker.raschek/dcmerge-goreleaser
username:
from_secret: git_cryptic_systems_container_registry_user
password:
@@ -547,7 +547,7 @@ trigger:
event:
- tag
repo:
- volker.raschek/dcmerge
- volker.raschek/dcmerge-goreleaser
---
kind: pipeline
@@ -577,7 +577,7 @@ steps:
mirror:
from_secret: docker_io_mirror
registry: git.cryptic.systems
repo: git.cryptic.systems/volker.raschek/dcmerge
repo: git.cryptic.systems/volker.raschek/dcmerge-goreleaser
username:
from_secret: git_cryptic_systems_container_registry_user
password:
@@ -607,7 +607,7 @@ trigger:
event:
- tag
repo:
- volker.raschek/dcmerge
- volker.raschek/dcmerge-goreleaser
---
kind: pipeline
@@ -667,7 +667,7 @@ trigger:
event:
- tag
repo:
- volker.raschek/dcmerge
- volker.raschek/dcmerge-goreleaser
---
kind: pipeline
@@ -686,7 +686,7 @@ steps:
- 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
- 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-goreleaser docker.io/volkerraschek
environment:
SRC_CRED_USERNAME:
from_secret: git_cryptic_systems_container_registry_user
@@ -724,4 +724,4 @@ trigger:
event:
- tag
repo:
- volker.raschek/dcmerge
- volker.raschek/dcmerge-goreleaser

2
.gitignore vendored
View File

@@ -1 +1 @@
dcmerge
dcmerge-goreleaser

2
Dockerfile
View File

@@ -17,4 +17,4 @@ COPY --from=build /cache /
WORKDIR /workspace
VOLUME [ "/workspace" ]
ENTRYPOINT [ "/usr/bin/dcmerge" ]
ENTRYPOINT [ "/usr/bin/dcmerge-goreleaser" ]

10
Makefile
View File

@@ -1,4 +1,4 @@
EXECUTABLE=dcmerge
EXECUTABLE=dcmerge-goreleaser
VERSION?=$(shell git describe --abbrev=0)+hash.$(shell git rev-parse --short HEAD)
# Destination directory and prefix to place the compiled binaries, documentaions
@@ -24,7 +24,7 @@ DCMERGE_IMAGE_UNQUALIFIED=${DCMERGE_IMAGE_NAMESPACE}/${DCMERGE_IMAGE_NAME}:${DCM
# BIN
# ==============================================================================
dcmerge:
dcmerge-goreleaser:
CGO_ENABLED=0 \
GOPRIVATE=$(shell go env GOPRIVATE) \
GOPROXY=$(shell go env GOPROXY) \
@@ -37,7 +37,7 @@ dcmerge:
# ==============================================================================
PHONY+=clean
clean:
rm --force --recursive dcmerge
rm --force --recursive dcmerge-goreleaser
# TESTS
# ==============================================================================
@@ -62,9 +62,9 @@ golangci-lint:
# INSTALL
# ==============================================================================
PHONY+=uninstall
install: dcmerge
install: dcmerge-goreleaser
install --directory ${DESTDIR}/etc/bash_completion.d
./dcmerge completion bash > ${DESTDIR}/etc/bash_completion.d/${EXECUTABLE}
./dcmerge-goreleaser completion bash > ${DESTDIR}/etc/bash_completion.d/${EXECUTABLE}
install --directory ${DESTDIR}${PREFIX}/bin
install --mode 0755 ${EXECUTABLE} ${DESTDIR}${PREFIX}/bin/${EXECUTABLE}

18
README.md
View File

@@ -1,12 +1,12 @@
# dcmerge
# dcmerge-goreleaser
[![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)
[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/dcmerge-goreleaser/status.svg)](https://drone.cryptic.systems/volker.raschek/dcmerge-goreleaser)
[![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/dcmerge-goreleaser)](https://hub.docker.com/r/volkerraschek/dcmerge-goreleaser)
`dcmerge` is a small program to merge docker-compose files from multiple sources. It is available via RPM and docker.
`dcmerge-goreleaser` is a small program to merge docker-compose files from multiple sources. It is available via RPM and docker.
The dynamic pattern of a docker-compose file, that for example `environments` can be specified as a string slice or a
list of objects is currently not supported. `dcmerge` expect a strict pattern layout. The `environments`, `ports` and
list of objects is currently not supported. `dcmerge-goreleaser` expect a strict pattern layout. The `environments`, `ports` and
`volumes` must be declared as a slice of strings.
Dockercompose file can be read-in from different sources. Currently are the following sources supported:
@@ -14,7 +14,7 @@ Dockercompose file can be read-in from different sources. Currently are the foll
- File
- HTTP/HTTPS
Furthermore, `dcmerge` support different ways to merge multiple docker-compose files.
Furthermore, `dcmerge-goreleaser` support different ways to merge multiple docker-compose files.
- The default merge, add missing secrets, services, networks and volumes.
- The existing-win merge, add and protect existing attributes.
@@ -48,7 +48,7 @@ services:
- /etc/localtime:/etc/localtime
- /dev/urandom:/etc/urandom
---
# dcmerge ~/docker-compose-A.yaml ~/docker-compose-B.yaml
# dcmerge-goreleaser ~/docker-compose-A.yaml ~/docker-compose-B.yaml
services:
app:
environments:
@@ -83,7 +83,7 @@ services:
- CLIENT_SECRET=FooBar123
image: example.local/app/name:0.1.0
---
# dcmerge --existing-win ~/docker-compose-A.yaml ~/docker-compose-B.yaml
# dcmerge-goreleaser --existing-win ~/docker-compose-A.yaml ~/docker-compose-B.yaml
services:
app:
environments:
@@ -113,7 +113,7 @@ services:
- CLIENT_SECRET=FooBar123
image: example.local/app/name:0.1.0
---
# dcmerge --last-win ~/docker-compose-A.yaml ~/docker-compose-B.yaml
# dcmerge-goreleaser --last-win ~/docker-compose-A.yaml ~/docker-compose-B.yaml
services:
app:
environments:

10
cmd/root.go
View File

@@ -5,8 +5,8 @@ import (
"os"
"path/filepath"
"git.cryptic.systems/volker.raschek/dcmerge/pkg/domain/dockerCompose"
"git.cryptic.systems/volker.raschek/dcmerge/pkg/fetcher"
"git.cryptic.systems/volker.raschek/dcmerge-goreleaser/pkg/domain/dockerCompose"
"git.cryptic.systems/volker.raschek/dcmerge-goreleaser/pkg/fetcher"
"github.com/spf13/cobra"
"gopkg.in/yaml.v2"
)
@@ -34,11 +34,11 @@ func Execute(version string) error {
}
rootCmd := &cobra.Command{
Use: "dcmerge",
Use: "dcmerge-goreleaser",
Args: cobra.MinimumNArgs(1),
Short: "Merge docker-compose files from multiple resources",
Example: `dcmerge docker-compose.yml ./integration-test/docker-compose.yml
dcmerge docker-compose.yml https://git.example.local/user/repo/docker-compose.yml`,
Example: `dcmerge-goreleaser docker-compose.yml ./integration-test/docker-compose.yml
dcmerge-goreleaser docker-compose.yml https://git.example.local/user/repo/docker-compose.yml`,
RunE: run,
Version: version,
}

2
go.mod
View File

@@ -1,4 +1,4 @@
module git.cryptic.systems/volker.raschek/dcmerge
module git.cryptic.systems/volker.raschek/dcmerge-goreleaser
go 1.20

2
main.go
View File

@@ -1,6 +1,6 @@
package main
import "git.cryptic.systems/volker.raschek/dcmerge/cmd"
import "git.cryptic.systems/volker.raschek/dcmerge-goreleaser/cmd"
var version string

6
manifest.tmpl
View File

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

2
pkg/domain/dockerCompose/config_test.go
View File

@@ -3,7 +3,7 @@ package dockerCompose_test
import (
"testing"
"git.cryptic.systems/volker.raschek/dcmerge/pkg/domain/dockerCompose"
"git.cryptic.systems/volker.raschek/dcmerge-goreleaser/pkg/domain/dockerCompose"
"github.com/stretchr/testify/require"
)

2
pkg/fetcher/fetcher.go
View File

@@ -7,7 +7,7 @@ import (
"net/url"
"os"
"git.cryptic.systems/volker.raschek/dcmerge/pkg/domain/dockerCompose"
"git.cryptic.systems/volker.raschek/dcmerge-goreleaser/pkg/domain/dockerCompose"
"gopkg.in/yaml.v2"
)