Merge pull request #24884 from Microsoft/jjh/TestBuildWorkdirWindowsPath

Windows: TestBuildWorkdirWindowsPath hard code fix
Upstream-commit: bdf4d9c1cd5fc6f91cb5ea831dfbe62870b4ab18
Component: engine

components/engine/integration-cli/docker_cli_build_test.go

@@ -6393,7 +6393,7 @@ func (s *DockerSuite) TestBuildWorkdirWindowsPath(c *check.C) {
 	name := "testbuildworkdirwindowspath"
 
 	_, err := buildImage(name, `
-	FROM windowsservercore
+	FROM `+WindowsBaseImage+`
 	RUN mkdir C:\\work
 	WORKDIR C:\\work
 	RUN if "%CD%" NEQ "C:\work" exit -1