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

fix(domain): mergeExistingWin: Services and Volumes

Browse Source 
Merge existing win of services and volumes correctly
This commit is contained in:
Markus Pesch
2025-12-23 00:08:04 +01:00
parent c21e507fcd
commit 8c52e19275
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/domain/dockerCompose/config.go
View File

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