mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-30 18:23:29 +03:00
Code Activity

Merge pull request #22868 from Microsoft/jjh/dockerfilecmd

Browse Source 
Windows: CMD not honouring arg escaping
This commit is contained in:
Sebastiaan van Stijn
2016-07-07 09:21:26 -07:00
committed by GitHub
parent ace1f176fe d05d0211bc
commit 6167a9ab16
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
integration-cli/docker_cli_build_test.go
View File

@ -6960,3 +6960,28 @@ func (s *DockerSuite) TestBuildShellWindowsPowershell(c *check.C) {
c.Fatalf("Line with 'John' not found in output %q", out)
}
}
// #22868. Make sure shell-form CMD is marked as escaped in the config of the image
func (s *DockerSuite) TestBuildCmdShellArgsEscaped(c *check.C) {
testRequires(c, DaemonIsWindows)
name := "testbuildcmdshellescaped"
_, err := buildImage(name, `
FROM `+minimalBaseImage()+`
CMD "tasklist"
`, true)
if err != nil {
c.Fatal(err)
}
res := inspectFieldJSON(c, name, "Config.ArgsEscaped")
if res != "true" {
c.Fatalf("CMD did not update Config.ArgsEscaped on image: %v", res)
}
dockerCmd(c, "run", "--name", "inspectme", name)
dockerCmd(c, "wait", "inspectme")
res = inspectFieldJSON(c, name, "Config.Cmd")
if res != `["cmd","/S","/C","\"tasklist\""]` {
c.Fatalf("CMD was not escaped Config.Cmd: got %v", res)
}
}