Merge pull request #771 from LinuxMercedes/error-on-empty-dockerfile

Have parser error on dockerfiles without instructions
moby · Jan 5, 2019 · 34ff9c2 · 34ff9c2
2 parents 03a86f1 + 2ec7d53
commit 34ff9c2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/frontend/dockerfile/parser/parser.go b/frontend/dockerfile/parser/parser.go
@@ -275,6 +275,11 @@ func Parse(rwc io.Reader) (*Result, error) {
 	if len(warnings) > 0 {
 		warnings = append(warnings, "[WARNING]: Empty continuation lines will become errors in a future release.")
 	}
+
+	if root.StartLine < 0 {
+		return nil, errors.New("file with no instructions.")
+	}
+
 	return &Result{
 		AST:         root,
 		Warnings:    warnings,

diff --git a/frontend/dockerfile/parser/testfiles-negative/empty_dockerfile/Dockerfile b/frontend/dockerfile/parser/testfiles-negative/empty_dockerfile/Dockerfile
diff --git a/frontend/dockerfile/parser/testfiles-negative/only_comments/Dockerfile b/frontend/dockerfile/parser/testfiles-negative/only_comments/Dockerfile
@@ -0,0 +1,3 @@
+# Hello
+# These are just comments
+