Merge pull request #4825 from profnandaa/fix-4696-normalize-path-func…

…tion fix: use unix path separator since windows path already normalized
moby · Apr 11, 2024 · 76c7422 · 76c7422
2 parents 549891b + 018155f
commit 76c7422
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -1152,10 +1152,6 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
 		return err
 	}
 
-	if cfg.params.DestPath == "." || cfg.params.DestPath == "" || cfg.params.DestPath[len(cfg.params.DestPath)-1] == filepath.Separator {
-		dest += string(filepath.Separator)
-	}
-
 	var copyOpt []llb.CopyOption
 
 	if cfg.chown != "" {
@@ -1576,9 +1572,9 @@ func pathRelativeToWorkingDir(s llb.State, p string, platform ocispecs.Platform)
 	}
 
 	if system.IsAbs(p, platform.OS) {
-		return system.NormalizePath("/", p, platform.OS, false)
+		return system.NormalizePath("/", p, platform.OS, true)
 	}
-	return system.NormalizePath(dir, p, platform.OS, false)
+	return system.NormalizePath(dir, p, platform.OS, true)
 }
 
 func addEnv(env []string, k, v string) []string {

diff --git a/solver/llbsolver/file/backend.go b/solver/llbsolver/file/backend.go
@@ -139,7 +139,7 @@ func docopy(ctx context.Context, src, dest string, action pb.FileActionCopy, u *
 	}
 	destPath, err := cleanPath(action.Dest)
 	if err != nil {
-		return errors.Wrap(err, "cleaning path")
+		return errors.Wrap(err, "cleaning destination path")
 	}
 	if !action.CreateDestPath {
 		p, err := fs.RootPath(dest, filepath.Join("/", action.Dest))