RepoMirrors
/
netns
mirror of https://github.com/vishvananda/netns
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from nickethier/docker-cgroup-mount 

Container cgroup location under systemd
This commit is contained in:
Vish Ishaya 2015-12-03 08:41:21 -08:00
parent 604eaf189e 0591c3f637
commit b73cffff5a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netns_linux.go
View File

@ -167,8 +167,10 @@ func getPidForContainer(id string) (int, error) {
filepath.Join(cgroupRoot, cgroupThis, id, "tasks"),
// With more recent lxc versions use, cgroup will be in lxc/
filepath.Join(cgroupRoot, cgroupThis, "lxc", id, "tasks"),
// With more recent dockee, cgroup will be in docker/
// With more recent docker, cgroup will be in docker/
filepath.Join(cgroupRoot, cgroupThis, "docker", id, "tasks"),
// Even more recent docker versions under systemd use docker-<id>.scope/
filepath.Join(cgroupRoot, "system.slice", "docker-"+id+".scope", "tasks"),
}
var filename string