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

Add LABEL config check to runconfig compare

Browse Source 
Without this we won't do a proper cacche check because we skip the
labels part of the config.

Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
Doug Davis
2015-03-20 05:55:48 -07:00
parent 385d4beaa5
commit b4beb0637a
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_build_test.go
+17 -2
View File
@@ -4585,14 +4585,29 @@ func TestBuildLabelsCache(t *testing.T) {
`FROM busybox
LABEL Vendor=Acme1`, true)
if err != nil || id1 == id2 {
t.Fatalf("Build 2 should have worked & NOT used cache(%s,%s): %v", id1, id2, err)
t.Fatalf("Build 3 should have worked & NOT used cache(%s,%s): %v", id1, id2, err)
}
id2, err = buildImage(name,
`FROM busybox
LABEL Vendor Acme`, true) // Note: " " and "=" should be same
if err != nil || id1 != id2 {
t.Fatalf("Build 3 should have worked & used cache(%s,%s): %v", id1, id2, err)
t.Fatalf("Build 4 should have worked & used cache(%s,%s): %v", id1, id2, err)
}
// Now make sure the cache isn't used by mistake
id1, err = buildImage(name,
`FROM busybox
LABEL f1=b1 f2=b2`, false)
if err != nil {
t.Fatalf("Build 5 should have worked: %q", err)
}
id2, err = buildImage(name,
`FROM busybox
LABEL f1="b1 f2=b2"`, true)
if err != nil || id1 == id2 {
t.Fatalf("Build 6 should have worked & NOT used the cache(%s,%s): %q", id1, id2, err)
}
logDone("build - label cache")