kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #16590 from Microsoft/10662-escapeargsfix

Browse source 
Windows: Flags to cmd are now sent as two separate arguments
This commit is contained in:
David Calavera 2015-09-25 13:29:54 -07:00
commit f0e904df8e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
builder/dispatchers.go
View file

@ -315,7 +315,7 @@ func run(ctx context.Context, b *builder, args []string, attributes map[string]b
if runtime.GOOS != "windows" { if runtime.GOOS != "windows" {
args = append([]string{"/bin/sh", "-c"}, args...) args = append([]string{"/bin/sh", "-c"}, args...)
} else { } else {
args = append([]string{"cmd", "/S /C"}, args...) args = append([]string{"cmd", "/S", "/C"}, args...)
} }
} }
@ -439,7 +439,7 @@ func cmd(ctx context.Context, b *builder, args []string, attributes map[string]b
if runtime.GOOS != "windows" { if runtime.GOOS != "windows" {
cmdSlice = append([]string{"/bin/sh", "-c"}, cmdSlice...) cmdSlice = append([]string{"/bin/sh", "-c"}, cmdSlice...)
} else { } else {
cmdSlice = append([]string{"cmd", "/S /C"}, cmdSlice...) cmdSlice = append([]string{"cmd", "/S", "/C"}, cmdSlice...)
} }
} }
@ -483,7 +483,7 @@ func entrypoint(ctx context.Context, b *builder, args []string, attributes map[s
if runtime.GOOS != "windows" { if runtime.GOOS != "windows" {
b.Config.Entrypoint = stringutils.NewStrSlice("/bin/sh", "-c", parsed[0]) b.Config.Entrypoint = stringutils.NewStrSlice("/bin/sh", "-c", parsed[0])
} else { } else {
b.Config.Entrypoint = stringutils.NewStrSlice("cmd", "/S /C", parsed[0]) b.Config.Entrypoint = stringutils.NewStrSlice("cmd", "/S", "/C", parsed[0])
} }
} }

4
builder/internals.go
View file

@ -89,7 +89,7 @@ func (b *builder) commit(ctx context.Context, id string, autoCmd *stringutils.St
if runtime.GOOS != "windows" { if runtime.GOOS != "windows" {
b.Config.Cmd = stringutils.NewStrSlice("/bin/sh", "-c", "#(nop) "+comment) b.Config.Cmd = stringutils.NewStrSlice("/bin/sh", "-c", "#(nop) "+comment)
} else { } else {
b.Config.Cmd = stringutils.NewStrSlice("cmd", "/S /C", "REM (nop) "+comment) b.Config.Cmd = stringutils.NewStrSlice("cmd", "/S", "/C", "REM (nop) "+comment)
} }
defer func(cmd *stringutils.StrSlice) { b.Config.Cmd = cmd }(cmd) defer func(cmd *stringutils.StrSlice) { b.Config.Cmd = cmd }(cmd)
@ -220,7 +220,7 @@ func (b *builder) runContextCommand(ctx context.Context, args []string, allowRem
if runtime.GOOS != "windows" { if runtime.GOOS != "windows" {
b.Config.Cmd = stringutils.NewStrSlice("/bin/sh", "-c", fmt.Sprintf("#(nop) %s %s in %s", cmdName, srcHash, dest)) b.Config.Cmd = stringutils.NewStrSlice("/bin/sh", "-c", fmt.Sprintf("#(nop) %s %s in %s", cmdName, srcHash, dest))
} else { } else {
b.Config.Cmd = stringutils.NewStrSlice("cmd", "/S /C", fmt.Sprintf("REM (nop) %s %s in %s", cmdName, srcHash, dest)) b.Config.Cmd = stringutils.NewStrSlice("cmd", "/S", "/C", fmt.Sprintf("REM (nop) %s %s in %s", cmdName, srcHash, dest))
} }
defer func(cmd *stringutils.StrSlice) { b.Config.Cmd = cmd }(cmd) defer func(cmd *stringutils.StrSlice) { b.Config.Cmd = cmd }(cmd)