GitList

Browse code

builder/normalizeWorkdir: Always return cleaned path

The `normalizeWorkdir` function has two branches, one that returns a
result of `filepath.Join` which always returns a cleaned path, and
another one where the input string is returned unmodified.

To make these two outputs consistent, also clean the path in the second
branch.

This also makes the cleaning of the container workdir explicit in the
`normalizeWorkdir` function instead of relying on the
`SetupWorkingDirectory` to mutate it.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>

Paweł Gronowski authored on 2024/04/16 20:45:12
Showing 2 changed files

builder/dockerfile/dispatchers_unix.go index ba8e1d9..d69e184 100644
integration-cli/docker_cli_build_test.go index 858d496..05f9e4b 100644

builder/dockerfile/dispatchers_unix.go

History View file @ a4d5b6b

@@ -22,7 +22,7 @@ func normalizeWorkdir(_ string, current string, requested string) (string, error
 	if !filepath.IsAbs(requested) {
 		return filepath.Join(string(os.PathSeparator), current, requested), nil
 	}
-	return requested, nil
+	return filepath.Clean(requested), nil
 }
 
 // resolveCmdLine takes a command line arg set and optionally prepends a platform-specific

integration-cli/docker_cli_build_test.go

History View file @ a4d5b6b

@@ -4296,7 +4296,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgExpansion(c *testing.T) {
                      	imgName := "bldvarstest"
                      	wdVar := "WDIR"
                     -	wdVal := "/tmp/"
                     +	wdVal := "/tmp"
                      	addVar := "AFILE"
                      	addVal := "addFile"
                      	copyVar := "CFILE"

...	...	@@ -22,7 +22,7 @@ func normalizeWorkdir(_ string, current string, requested string) (string, error
22	22	if !filepath.IsAbs(requested) {
23	23	return filepath.Join(string(os.PathSeparator), current, requested), nil
24	24	}
25		- return requested, nil
	25	+ return filepath.Clean(requested), nil
26	26	}
27	27
28	28	// resolveCmdLine takes a command line arg set and optionally prepends a platform-specific