summaryrefslogtreecommitdiff
path: root/integration-cli/docker_cli_create_test.go
diff options
context:
space:
mode:
authorArnaud Porterie <arnaud.porterie@docker.com>2015-06-05 10:56:25 -0700
committerArnaud Porterie <arnaud.porterie@docker.com>2015-06-05 11:11:22 -0700
commit79621c7728ab83292ffd94d005f10ccebfba055b (patch)
tree08d2b42863dd47d342c98b941716b4b983baf2bd /integration-cli/docker_cli_create_test.go
parentcd1a1ee9729f76789194a5b5f6dcbc7fa7282420 (diff)
downloaddocker-79621c7728ab83292ffd94d005f10ccebfba055b.tar.gz
Container don't inherit from image labels
Labels are metadata that apply to a particular resource: image, container, maybe volumes and networks in the future. We shouldn't have containers inherit from its image labels: they are not the same obejcts, and labels cannot be interpreted in the way. It remains possible to apply metadata to an image using the LABEL Dockerfile instruction, to query them using `docker inspect <img>`, or to filter images on them using `docker images --filter <key>=<value>`. Fixes #13770. Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Diffstat (limited to 'integration-cli/docker_cli_create_test.go')
-rw-r--r--integration-cli/docker_cli_create_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/integration-cli/docker_cli_create_test.go b/integration-cli/docker_cli_create_test.go
index 019ea97fc6..23c9ae165b 100644
--- a/integration-cli/docker_cli_create_test.go
+++ b/integration-cli/docker_cli_create_test.go
@@ -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)
}