Merge pull request #283 from nalind/workdir-trailing-separator

Trim trailing path separators from WORKDIR values

Author: openshift-merge-bot[bot]

dispatchers.go

@@ -372,6 +372,10 @@ func workdir(b *Builder, args []string, attributes map[string]bool, flagArgs []s
 		workdir = filepath.Join(string(os.PathSeparator), current, workdir)
 	}
 
+	if workdir != string(os.PathSeparator) {
+		workdir = strings.TrimSuffix(workdir, string(os.PathSeparator))
+	}
+
 	b.RunConfig.WorkingDir = workdir
 	return nil
 }

dockerclient/conformance_test.go

@@ -484,6 +484,14 @@ func TestConformanceInternal(t *testing.T) {
 			Name:       "healthcheck",
 			Dockerfile: "testdata/Dockerfile.healthcheck",
 		},
+		{
+			Name:       "workdir-with-trailing-path-separator",
+			Dockerfile: "testdata/workdir/Dockerfile.trailing",
+		},
+		{
+			Name:       "workdir-without-trailing-path-separator",
+			Dockerfile: "testdata/workdir/Dockerfile.notrailing",
+		},
 	}
 
 	for i, test := range testCases {
@@ -518,7 +526,7 @@ func TestConformanceExternal(t *testing.T) {
 		{
 			Name: "copy and env interaction",
 			// Tests COPY and other complex interactions of ENV
-			ContextDir: "16/alpine3.18",
+			ContextDir: "16/alpine3.20",
 			Dockerfile: "Dockerfile",
 			Git:        "https://github.com/docker-library/postgres.git",
 			Ignore: []ignoreFunc{

dockerclient/testdata/workdir/Dockerfile.notrailing

@@ -0,0 +1,3 @@
+FROM busybox
+USER daemon
+WORKDIR /tmp

dockerclient/testdata/workdir/Dockerfile.trailing

@@ -0,0 +1,3 @@
+FROM busybox
+USER daemon
+WORKDIR /tmp/