InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

commit: do not change container labels on commit

Browse Source 
Fix #29547

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov
2016-12-19 09:56:20 -08:00
parent 38886bbd74
commit ca6c6f0765
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/commit.go
View File

@@ -65,11 +65,10 @@ func merge(userConf, imageConf *containertypes.Config) error {
if userConf.Labels == nil {
userConf.Labels = map[string]string{}
}
if imageConf.Labels != nil {
for l := range userConf.Labels {
imageConf.Labels[l] = userConf.Labels[l]
for l, v := range imageConf.Labels {
if _, ok := userConf.Labels[l]; !ok {
userConf.Labels[l] = v
}
userConf.Labels = imageConf.Labels
}
if len(userConf.Entrypoint) == 0 {