зеркало из https://github.com/microsoft/docker.git
Merge pull request #3698 from alexlarsson/fix-shared-root
Fix handling of shared roots
This commit is contained in:
Коммит
f98a596be9
|
@ -111,6 +111,9 @@ func (d *driver) Run(c *execdriver.Process, startCallback execdriver.StartCallba
|
||||||
params = append(params, "-w", c.WorkingDir)
|
params = append(params, "-w", c.WorkingDir)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
params = append(params, "--", c.Entrypoint)
|
||||||
|
params = append(params, c.Arguments...)
|
||||||
|
|
||||||
if d.sharedRoot {
|
if d.sharedRoot {
|
||||||
// lxc-start really needs / to be non-shared, or all kinds of stuff break
|
// lxc-start really needs / to be non-shared, or all kinds of stuff break
|
||||||
// when lxc-start unmount things and those unmounts propagate to the main
|
// when lxc-start unmount things and those unmounts propagate to the main
|
||||||
|
@ -127,9 +130,6 @@ func (d *driver) Run(c *execdriver.Process, startCallback execdriver.StartCallba
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
params = append(params, "--", c.Entrypoint)
|
|
||||||
params = append(params, c.Arguments...)
|
|
||||||
|
|
||||||
var (
|
var (
|
||||||
name = params[0]
|
name = params[0]
|
||||||
arg = params[1:]
|
arg = params[1:]
|
||||||
|
|
Загрузка…
Ссылка в новой задаче