Windows: CMD not honouring arg escaping

Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d05d0211bcf43d4519bfcbbc6029fafa122f86b7
Component: engine
This commit is contained in:
John Howard
2016-05-20 16:05:14 -07:00
parent eb4a784598
commit 610f859f67
3 changed files with 28 additions and 0 deletions

View File

@ -74,6 +74,7 @@ func merge(userConf, imageConf *containertypes.Config) error {
if len(userConf.Entrypoint) == 0 {
if len(userConf.Cmd) == 0 {
userConf.Cmd = imageConf.Cmd
userConf.ArgsEscaped = imageConf.ArgsEscaped
}
if userConf.Entrypoint == nil {