Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[18.09 backport] Have parser error on dockerfiles without instructions #952

Merged
merged 1 commit into from
Apr 20, 2019
Merged

[18.09 backport] Have parser error on dockerfiles without instructions #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions frontend/dockerfile/parser/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Empty file added frontend/dockerfile/parser/testfiles-negative/empty_dockerfile/Dockerfile
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions frontend/dockerfile/parser/testfiles-negative/only_comments/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Hello
# These are just comments