p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix --ipc=host dependency on /dev/mqueue existing"

Browse Source 
This reverts commit f624d6187a8daa3ca0999c46cb345f8db6f330e7.

Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
Upstream-commit: ab7923558d61caccafd08aee667e7fc44a80164e
Component: engine
This commit is contained in:
Burke Libbey
2015-10-14 10:45:57 -04:00
parent c77d193921
commit 177d0dd24f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/container.go
View File

@ -288,7 +288,7 @@ func (container *Container) Start() (err error) {
return err
}
if !container.hostConfig.IpcMode.IsContainer() {
if !container.hostConfig.IpcMode.IsContainer() && !container.hostConfig.IpcMode.IsHost() {
if err := container.setupIpcDirs(); err != nil {
return err
}

8
components/engine/daemon/container_unix.go
View File

@ -214,6 +214,12 @@ func populateCommand(c *Container, env []string) error {
ipc.ContainerID = ic.ID
c.ShmPath = ic.ShmPath
c.MqueuePath = ic.MqueuePath
} else {
ipc.HostIpc = c.hostConfig.IpcMode.IsHost()
if ipc.HostIpc {
c.ShmPath = "/dev/shm"
c.MqueuePath = "/dev/mqueue"
}
}
pid := &execdriver.Pid{}
@ -1402,7 +1408,7 @@ func (container *Container) setupIpcDirs() error {
}
func (container *Container) unmountIpcMounts() error {
if container.hostConfig.IpcMode.IsContainer() {
if container.hostConfig.IpcMode.IsContainer() || container.hostConfig.IpcMode.IsHost() {
return nil
}