dockerfile: promote --parents flag from labs

Signed-off-by: Jonathan A. Sternberg <[email protected]>

Author: jsternberg

docker-bake.hcl

@@ -233,7 +233,7 @@ target "lint" {
   matrix = {
     buildtags = [
       { name = "default", tags = "", target = "golangci-lint" },
-      { name = "labs", tags = "dfrunsecurity dfparents", target = "golangci-lint" },
+      { name = "labs", tags = "dfrunsecurity dfrundevice", target = "golangci-lint" },
       { name = "nydus", tags = "nydus", target = "golangci-lint" },
       { name = "yaml", tags = "", target = "yamllint" },
       { name = "golangci-verify", tags = "", target = "golangci-verify" },

frontend/dockerfile/dockerfile_parents_test.go

@@ -1,5 +1,3 @@
-//go:build dfparents
-
 package dockerfile
 
 import (

frontend/dockerfile/instructions/parse.go

@@ -36,8 +36,6 @@ var (
 	parseRunPostHooks []func(*RunCommand, parseRequest) error
 )
 
-var parentsEnabled = false
-
 func nodeArgs(node *parser.Node) []string {
 	result := []string{}
 	for ; node.Next != nil; node = node.Next {
@@ -313,14 +311,6 @@ func parseSourcesAndDest(req parseRequest, command string) (*SourcesAndDest, err
 	}, nil
 }
 
-func stringValuesFromFlagIfPossible(f *Flag) []string {
-	if f == nil {
-		return nil
-	}
-
-	return f.StringValues
-}
-
 func parseAdd(req parseRequest) (*AddCommand, error) {
 	if len(req.args) < 2 {
 		return nil, errNoDestinationArgument("ADD")
@@ -362,7 +352,7 @@ func parseAdd(req parseRequest) (*AddCommand, error) {
 		Link:            flLink.Value == "true",
 		KeepGitDir:      keepGit,
 		Checksum:        flChecksum.Value,
-		ExcludePatterns: stringValuesFromFlagIfPossible(flExcludes),
+		ExcludePatterns: flExcludes.StringValues,
 		Unpack:          unpack,
 	}, nil
 }
@@ -372,16 +362,12 @@ func parseCopy(req parseRequest) (*CopyCommand, error) {
 		return nil, errNoDestinationArgument("COPY")
 	}
 
-	var flParents *Flag
-	if parentsEnabled {
-		flParents = req.flags.AddBool("parents", false)
-	}
-
 	flChown := req.flags.AddString("chown", "")
 	flFrom := req.flags.AddString("from", "")
 	flChmod := req.flags.AddString("chmod", "")
 	flLink := req.flags.AddBool("link", false)
 	flExcludes := req.flags.AddStrings("exclude")
+	flParents := req.flags.AddBool("parents", false)
 
 	if err := req.flags.Parse(); err != nil {
 		return nil, err
@@ -399,8 +385,8 @@ func parseCopy(req parseRequest) (*CopyCommand, error) {
 		Chown:           flChown.Value,
 		Chmod:           flChmod.Value,
 		Link:            flLink.Value == "true",
-		Parents:         flParents != nil && flParents.Value == "true",
-		ExcludePatterns: stringValuesFromFlagIfPossible(flExcludes),
+		Parents:         flParents.Value == "true",
+		ExcludePatterns: flExcludes.StringValues,
 	}, nil
 }
 

frontend/dockerfile/instructions/parse_parents.go

@@ -1 +1 @@
-dfrunsecurity dfparents dfrundevice
+dfrunsecurity dfrundevice