From 5dea30fec02e1a7cfc1988e998300233f6329e42 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Sat, 25 Nov 2023 18:18:08 +0100 Subject: [PATCH] fix(domain): iterate when merging over custom configs The normal dcmerge did not work, as the check and addition was only possible if at least one attribute such as service, network or volume was presentThe normal dcmerge did not work, as the check and addition was only possible if at least one attribute such as service, network or volume was present. The logic was adjusted. The logic was adjusted. --- pkg/domain/dockerCompose/config.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/domain/dockerCompose/config.go b/pkg/domain/dockerCompose/config.go index c0d2ee1..287d50c 100644 --- a/pkg/domain/dockerCompose/config.go +++ b/pkg/domain/dockerCompose/config.go @@ -66,25 +66,25 @@ func (c *Config) ExistsVolume(name string) bool { // Merge adds only a missing network, secret, service and volume. func (c *Config) Merge(config *Config) { - for name, network := range c.Networks { + for name, network := range config.Networks { if !c.ExistsNetwork(name) { c.Networks[name] = network } } - for name, secret := range c.Secrets { + for name, secret := range config.Secrets { if !c.ExistsSecret(name) { c.Secrets[name] = secret } } - for name, service := range c.Services { + for name, service := range config.Services { if !c.ExistsService(name) { c.Services[name] = service } } - for name, volume := range c.Volumes { + for name, volume := range config.Volumes { if !c.ExistsVolume(name) { c.Volumes[name] = volume }