Add --parents flag for ADD/COPY instructions

.golangci.yml

@@ -8,6 +8,7 @@ run:
   build-tags:
     - dfrunsecurity
     - dfaddgit
+    - dfparents
 
 linters:
   enable:

client/llb/fileop.go

@@ -439,6 +439,7 @@ type CopyInfo struct {
 	AllowEmptyWildcard  bool
 	ChownOpt            *ChownOpt
 	CreatedTime         *time.Time
+	Parents             bool
 }
 
 func (mi *CopyInfo) SetCopyOption(mi2 *CopyInfo) {
@@ -473,6 +474,7 @@ func (a *fileActionCopy) toProtoAction(ctx context.Context, parent string, base
 		AttemptUnpackDockerCompatibility: a.info.AttemptUnpack,
 		CreateDestPath:                   a.info.CreateDestPath,
 		Timestamp:                        marshalTime(a.info.CreatedTime),
+		Parents:                          a.info.Parents,
 	}
 	if a.info.Mode != nil {
 		c.Mode = int32(*a.info.Mode)

frontend/dockerfile/dockerfile2llb/convert.go

@@ -654,6 +654,7 @@ func dispatch(d *dispatchState, cmd command, opt dispatchOpt) error {
 			chmod:        c.Chmod,
 			link:         c.Link,
 			keepGitDir:   c.KeepGitDir,
+			parents:      c.Parents,
 			location:     c.Location(),
 			opt:          opt,
 		})
@@ -699,6 +700,7 @@ func dispatch(d *dispatchState, cmd command, opt dispatchOpt) error {
 			chown:        c.Chown,
 			chmod:        c.Chmod,
 			link:         c.Link,
+			parents:      c.Parents,
 			location:     c.Location(),
 			opt:          opt,
 		})
@@ -1066,6 +1068,9 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
 				a = a.Copy(st, f, dest, opts...)
 			}
 		} else {
+			if cfg.parents && !parentsEnabled {
+				return errors.New("flag --parents for ADD/COPY instructions requires the labs channel")
+			}
 			opts := append([]llb.CopyOption{&llb.CopyInfo{
 				Mode:                mode,
 				FollowSymlinks:      true,
@@ -1074,6 +1079,7 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
 				CreateDestPath:      true,
 				AllowWildcard:       true,
 				AllowEmptyWildcard:  true,
+				Parents:             cfg.parents,
 			}}, copyOpt...)
 
 			if a == nil {
@@ -1159,6 +1165,7 @@ type copyConfig struct {
 	chmod        string
 	link         bool
 	keepGitDir   bool
+	parents      bool
 	location     []parser.Range
 	opt          dispatchOpt
 }

frontend/dockerfile/dockerfile2llb/convert_noparents.go

@@ -0,0 +1,6 @@
+//go:build !dfparents
+// +build !dfparents
+
+package dockerfile2llb
+
+const parentsEnabled = false

frontend/dockerfile/dockerfile2llb/convert_parents.go

@@ -0,0 +1,6 @@
+//go:build dfparents
+// +build dfparents
+
+package dockerfile2llb
+
+const parentsEnabled = true

frontend/dockerfile/instructions/commands.go

@@ -228,6 +228,7 @@ type AddCommand struct {
 	Chmod      string
 	Link       bool
 	KeepGitDir bool // whether to keep .git dir, only meaningful for git sources
+	Parents    bool // parents preserves directory structure
 }
 
 // Expand variables
@@ -248,10 +249,11 @@ func (c *AddCommand) Expand(expander SingleWordExpander) error {
 type CopyCommand struct {
 	withNameAndCode
 	SourcesAndDest
-	From  string
-	Chown string
-	Chmod string
-	Link  bool
+	From    string
+	Chown   string
+	Chmod   string
+	Link    bool
+	Parents bool // parents preserves directory structure
 }
 
 // Expand variables

frontend/dockerfile/instructions/parse.go

@@ -282,6 +282,7 @@ func parseAdd(req parseRequest) (*AddCommand, error) {
 	flChmod := req.flags.AddString("chmod", "")
 	flLink := req.flags.AddBool("link", false)
 	flKeepGitDir := req.flags.AddBool("keep-git-dir", false)
+	flParents := req.flags.AddBool("parents", false)
 	if err := req.flags.Parse(); err != nil {
 		return nil, err
 	}
@@ -298,6 +299,7 @@ func parseAdd(req parseRequest) (*AddCommand, error) {
 		Chmod:           flChmod.Value,
 		Link:            flLink.Value == "true",
 		KeepGitDir:      flKeepGitDir.Value == "true",
+		Parents:         flParents.Value == "true",
 	}, nil
 }
 
@@ -309,6 +311,7 @@ func parseCopy(req parseRequest) (*CopyCommand, error) {
 	flFrom := req.flags.AddString("from", "")
 	flChmod := req.flags.AddString("chmod", "")
 	flLink := req.flags.AddBool("link", false)
+	flParents := req.flags.AddBool("parents", false)
 	if err := req.flags.Parse(); err != nil {
 		return nil, err
 	}
@@ -325,6 +328,7 @@ func parseCopy(req parseRequest) (*CopyCommand, error) {
 		Chown:           flChown.Value,
 		Chmod:           flChmod.Value,
 		Link:            flLink.Value == "true",
+		Parents:         flParents.Value == "true",
 	}, nil
 }
 

frontend/dockerfile/release/labs/tags

@@ -1 +1 @@
-dfrunsecurity dfaddgit
+dfrunsecurity dfaddgit dfparents

solver/llbsolver/file/backend.go

@@ -205,15 +205,31 @@ func docopy(ctx context.Context, src, dest string, action pb.FileActionCopy, u *
 		copy.WithXAttrErrorHandler(xattrErrorHandler),
 	}
 
-	if !action.AllowWildcard {
+	copy_one := func(s string) error {
+		d := destPath
+		if action.Parents {
+			d = filepath.Join("/", d, s)
+		}
 		if action.AttemptUnpackDockerCompatibility {
-			if ok, err := unpack(ctx, src, srcPath, dest, destPath, ch, timestampToTime(action.Timestamp)); err != nil {
+			if ok, err := unpack(ctx, src, s, dest, d, ch, timestampToTime(action.Timestamp)); err != nil {
 				return err
 			} else if ok {
 				return nil
 			}
 		}
-		return copy.Copy(ctx, src, srcPath, dest, destPath, opt...)
+		return copy.Copy(ctx, src, s, dest, d, opt...)
+	}
+
+	if !action.AllowWildcard {
+		// if action.AttemptUnpackDockerCompatibility {
+		// 	if ok, err := unpack(ctx, src, srcPath, dest, destPath, ch, timestampToTime(action.Timestamp)); err != nil {
+		// 		return err
+		// 	} else if ok {
+		// 		return nil
+		// 	}
+		// }
+		// return copy.Copy(ctx, src, srcPath, dest, destPath, opt...)
+		return copy_one(src)
 	}
 
 	m, err := copy.ResolveWildcards(src, srcPath, action.FollowSymlink)
@@ -229,14 +245,17 @@ func docopy(ctx context.Context, src, dest string, action pb.FileActionCopy, u *
 	}
 
 	for _, s := range m {
-		if action.AttemptUnpackDockerCompatibility {
-			if ok, err := unpack(ctx, src, s, dest, destPath, ch, timestampToTime(action.Timestamp)); err != nil {
-				return err
-			} else if ok {
-				continue
-			}
-		}
-		if err := copy.Copy(ctx, src, s, dest, destPath, opt...); err != nil {
+		// if action.AttemptUnpackDockerCompatibility {
+		// 	if ok, err := unpack(ctx, src, s, dest, destPath, ch, timestampToTime(action.Timestamp)); err != nil {
+		// 		return err
+		// 	} else if ok {
+		// 		continue
+		// 	}
+		// }
+		// if err := copy.Copy(ctx, src, s, dest, destPath, opt...); err != nil {
+		// 	return err
+		// }
+		if err := copy_one(s); err != nil {
 			return err
 		}
 	}