deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Fix labels merge error (#1380)

Browse Source
This commit is contained in:
Hang Yan 2021-05-01 18:27:41 +08:00 committed by GitHub
parent fb3b2257c6
commit bd1abffb16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/loader/compose/v3.go
View File

@ -747,6 +747,9 @@ func mergeComposeObject(oldCompose *types.Config, newCompose *types.Config) (*ty
}
if len(service.Labels) != 0 {
// merge the 2 sets of values
if tmpOldService.Labels == nil {
tmpOldService.Labels = make(map[string]string)
}
for k, v := range service.Labels {
tmpOldService.Labels[k] = v
}