clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-07 14:32:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: execdriver: lxc: fix cgroup paths

Browse Source 
When running LXC dind (outer docker is started with native driver)
cgroup paths point to `/docker/CID` inside `/proc/self/mountinfo` but
these paths aren't mounted (root is wrong). This fix just discard the
cgroup dir from mountinfo and set it to root `/`.
This patch fixes/skip OOM LXC tests that were failing.
Fix #16520

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
This commit is contained in:
Antonio Murdaca
2015-10-13 14:46:59 -07:00
committed by Jessica Frazelle
parent 06f0d03ced
commit cfcddefacd
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/execdriver/native/driver.go
-1
View File
@@ -167,7 +167,6 @@ func (d *Driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, hooks execd
oom := notifyOnOOM(cont)
if hooks.Start != nil {
pid, err := p.Pid()
if err != nil {
p.Signal(os.Kill)