Fix missing chown/chmod when using parents flag with ADD/COPY command

Signed-off-by: Nobi <[email protected]>

frontend/dockerfile/dockerfile2llb/convert.go

@@ -1219,24 +1219,24 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
 				return errors.Wrap(err, "removing drive letter")
 			}
 
+			var patterns []string
+			if cfg.parents {
+				path := strings.TrimPrefix(src, "/")
+				patterns = []string{path}
+				src = "/"
+			}
+
 			opts := append([]llb.CopyOption{&llb.CopyInfo{
 				Mode:                mode,
 				FollowSymlinks:      true,
 				CopyDirContentsOnly: true,
+				IncludePatterns:     patterns,
 				AttemptUnpack:       cfg.isAddCommand,
 				CreateDestPath:      true,
 				AllowWildcard:       true,
 				AllowEmptyWildcard:  true,
 			}}, copyOpt...)
 
-			if cfg.parents {
-				path := strings.TrimPrefix(src, "/")
-				opts = append(opts, &llb.CopyInfo{
-					IncludePatterns: []string{path},
-				})
-				src = "/"
-			}
-
 			if a == nil {
 				a = llb.Copy(cfg.source, src, dest, opts...)
 			} else {

patch.diff

@@ -0,0 +1,37 @@
+diff --git a/dockerfile/dockerfile2llb/convert.go b/dockerfile/dockerfile2llb/convert.go
+index eca634b..f64ab2b 100644
+--- a/frontend/dockerfile/dockerfile2llb/convert.go
++++ b/frontend/dockerfile/dockerfile2llb/convert.go
+@@ -1218,24 +1218,24 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
+ 				return errors.Wrap(err, "removing drive letter")
+ 			}
+
++			var patterns []string
++			if cfg.parents {
++				path := strings.TrimPrefix(src, "/")
++				patterns = []string{path}
++				src = "/"
++			}
++
+ 			opts := append([]llb.CopyOption{&llb.CopyInfo{
+ 				Mode:                mode,
+ 				FollowSymlinks:      true,
+ 				CopyDirContentsOnly: true,
++				IncludePatterns:     patterns,
+ 				AttemptUnpack:       cfg.isAddCommand,
+ 				CreateDestPath:      true,
+ 				AllowWildcard:       true,
+ 				AllowEmptyWildcard:  true,
+ 			}}, copyOpt...)
+
+-			if cfg.parents {
+-				path := strings.TrimPrefix(src, "/")
+-				opts = append(opts, &llb.CopyInfo{
+-					IncludePatterns: []string{path},
+-				})
+-				src = "/"
+-			}
+-
+ 			if a == nil {
+ 				a = llb.Copy(cfg.source, src, dest, opts...)
+ 			} else {