clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 05:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15503 from ibuildthecloud/revert-label

Browse Source 
Revert "Container don't inherit from image labels"
This commit is contained in:
Arnaud Porterie
2015-10-12 10:03:18 -07:00
parent 2d1414e8b0 8b91b3cf77
commit b0cbc02283
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_create_test.go
+1 -1
View File
@@ -234,7 +234,7 @@ func (s *DockerSuite) TestCreateLabelFromImage(c *check.C) {
}
name := "test_create_labels_from_image"
expected := map[string]string{"k2": "x", "k3": "v3"}
expected := map[string]string{"k2": "x", "k3": "v3", "k1": "v1"}
dockerCmd(c, "create", "--name", name, "-l", "k2=x", "--label", "k3=v3", imageName)
actual := make(map[string]string)