Merge pull request #14113 from dit4c/10348-exec-privileged

Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2015-08-16 00:20:41 +02:00
7 changed files with 68 additions and 17 deletions

View File

@ -19,7 +19,6 @@ import (
// Exec implements the exec driver Driver interface,
// it calls libcontainer APIs to execute a container.
// TODO(vishh): Add support for running in privileged mode.
func (d *Driver) Exec(c *execdriver.Command, processConfig *execdriver.ProcessConfig, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (int, error) {
active := d.activeContainers[c.ID]
if active == nil {
@ -33,6 +32,10 @@ func (d *Driver) Exec(c *execdriver.Command, processConfig *execdriver.ProcessCo
User: processConfig.User,
}
if processConfig.Privileged {
p.Capabilities = execdriver.GetAllCapabilities()
}
config := active.Config()
if err := setupPipes(&config, processConfig, p, pipes); err != nil {
return -1, err