|
@@ -63,11 +63,9 @@ func (daemon *Daemon) createSpec(c *container.Container) (*libcontainerd.Spec, e
|
|
}
|
|
}
|
|
|
|
|
|
// In s.Process
|
|
// In s.Process
|
|
- if c.Config.ArgsEscaped {
|
|
|
|
- s.Process.Args = append([]string{c.Path}, c.Args...)
|
|
|
|
- } else {
|
|
|
|
- // TODO (jstarks): escape the entrypoint too once the tests are fixed to not rely on this behavior
|
|
|
|
- s.Process.Args = append([]string{c.Path}, escapeArgs(c.Args)...)
|
|
|
|
|
|
+ s.Process.Args = append([]string{c.Path}, c.Args...)
|
|
|
|
+ if !c.Config.ArgsEscaped {
|
|
|
|
+ s.Process.Args = escapeArgs(s.Process.Args)
|
|
}
|
|
}
|
|
s.Process.Cwd = c.Config.WorkingDir
|
|
s.Process.Cwd = c.Config.WorkingDir
|
|
s.Process.Env = c.CreateDaemonEnvironment(linkedEnv)
|
|
s.Process.Env = c.CreateDaemonEnvironment(linkedEnv)
|