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

This reverts commit f624d6187a8daa3ca0999c46cb345f8db6f330e7.

Signed-off-by: Burke Libbey <burke.libbey@shopify.com>

daemon/container.go

@@ -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
 		}

daemon/container_unix.go

@@ -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
 	}