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

Fix getPidForContainer for later releases of docker

This commit is contained in:
Nick Ethier 2015-08-11 15:02:56 -06:00
parent 604eaf189e
commit f345454358
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"), filepath.Join(cgroupRoot, cgroupThis, id, "tasks"),
// With more recent lxc versions use, cgroup will be in lxc/ // With more recent lxc versions use, cgroup will be in lxc/
filepath.Join(cgroupRoot, cgroupThis, "lxc", id, "tasks"), 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"), filepath.Join(cgroupRoot, cgroupThis, "docker", id, "tasks"),
// Even more recent docker versions under systemd use docker-<id>.scope/
filepath.Join(cgroupRoot, cgroupThis, "docker-" + id + ".scope", tasks"),
} }
var filename string var filename string