docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Since #15862, containers fail to start when started with --ipc=host if
/dev/mqueue is not present. This change causes docker to create
container-local mounts for --ipc=host containers as well as in the
default case.

Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
This commit is contained in:
Burke Libbey 2015-10-13 17:46:55 -04:00
parent 9ead1663c3
commit f624d6187a
No known key found for this signature in database
GPG Key ID: E893DEF914F22410
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/container.go
View File

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

8
daemon/container_unix.go
View File

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