Stabilize dockerfile heredoc support

Signed-off-by: Justin Chadwell <[email protected]>
moby · Feb 10, 2022 · e3fd4a6 · e3fd4a6
1 parent 9fb13f7
commit e3fd4a6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 31 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -7,7 +7,6 @@ run:
 
   build-tags:
     - dfrunsecurity
-    - dfheredoc
 
 linters:
   enable:

diff --git a/frontend/dockerfile/dockerfile_heredoc_test.go b/frontend/dockerfile/dockerfile_heredoc_test.go
@@ -1,6 +1,3 @@
-//go:build dfheredoc
-// +build dfheredoc
-
 package dockerfile
 
 import (

diff --git a/frontend/dockerfile/instructions/parse_heredoc_test.go b/frontend/dockerfile/instructions/parse_heredoc_test.go
@@ -1,6 +1,3 @@
-//go:build dfheredoc
-// +build dfheredoc
-
 package instructions
 
 import (

diff --git a/frontend/dockerfile/parser/parser.go b/frontend/dockerfile/parser/parser.go
@@ -130,8 +130,17 @@ var validDirectives = map[string]struct{}{
 }
 
 var (
-	heredocDirectives         map[string]bool // directives allowed to contain heredocs
-	heredocCompoundDirectives map[string]bool // directives allowed to contain directives containing heredocs
+	// Directives allowed to contain heredocs
+	heredocDirectives = map[string]bool{
+		command.Add:  true,
+		command.Copy: true,
+		command.Run:  true,
+	}
+
+	// Directives allowed to contain directives containing heredocs
+	heredocCompoundDirectives = map[string]bool{
+		command.Onbuild: true,
+	}
 )
 
 // directive is the structure used during a build run to hold the state of

diff --git a/frontend/dockerfile/parser/parser_heredoc.go b/frontend/dockerfile/parser/parser_heredoc.go
diff --git a/frontend/dockerfile/parser/parser_heredoc_test.go b/frontend/dockerfile/parser/parser_heredoc_test.go
@@ -1,6 +1,3 @@
-//go:build dfheredoc
-// +build dfheredoc
-
 package parser
 
 import (

diff --git a/frontend/dockerfile/release/labs/tags b/frontend/dockerfile/release/labs/tags
@@ -1 +1 @@
-dfrunsecurity dfheredoc
+dfrunsecurity