docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity

Merge pull request #13772 from icecrime/13770_image_labels_to_containers

Browse Source 
Container don't inherit from image labels
Upstream-commit: af29aff53c95ed2a478693b566cc93c19362cce8
Component: engine
This commit is contained in:
Jessie Frazelle
2015-06-05 13:25:34 -07:00
parent 52a74c1bf3 4dfff4ae36
commit f43a943abe
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/integration-cli/docker_cli_create_test.go
View File

@@ -269,7 +269,7 @@ func (s *DockerSuite) TestCreateLabelFromImage(c *check.C) {
}
name := "test_create_labels_from_image"
expected := map[string]string{"k2": "x", "k3": "v3", "k1": "v1"}
expected := map[string]string{"k2": "x", "k3": "v3"}
if out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "create", "--name", name, "-l", "k2=x", "--label", "k3=v3", imageName)); err != nil {
c.Fatal(out, err)
}

10
components/engine/runconfig/merge.go
View File

@@ -41,16 +41,6 @@ func Merge(userConf, imageConf *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]
}
userConf.Labels = imageConf.Labels
}
if userConf.Entrypoint.Len() == 0 {
if userConf.Cmd.Len() == 0 {
userConf.Cmd = imageConf.Cmd