Merge pull request #8434 from tiborvass/ignore_invalid_Dockerfile_instructions

Ignore unknown dockerfile instructions
This commit is contained in:
Jessie Frazelle
2014-10-07 14:45:51 -07:00
5 changed files with 48 additions and 38 deletions
+12
View File
@@ -2447,3 +2447,15 @@ func TestBuildCmdJSONNoShDashC(t *testing.T) {
logDone("build - cmd should not have /bin/sh -c for json")
}
func TestBuildIgnoreInvalidInstruction(t *testing.T) {
name := "testbuildignoreinvalidinstruction"
defer deleteImages(name)
out, _, err := buildImageWithOut(name, "FROM busybox\nfoo bar", true)
if err != nil {
t.Fatal(err, out)
}
logDone("build - ignore invalid Dockerfile instruction")
}