diff --git a/deimos/containerizer/__init__.py b/deimos/containerizer/__init__.py index 52e19c6..5c6a86e 100644 --- a/deimos/containerizer/__init__.py +++ b/deimos/containerizer/__init__.py @@ -2,6 +2,7 @@ import logging import os import re +import subprocess try: # Prefer system installation of Mesos protos if available from mesos_pb2 import * diff --git a/deimos/docker.py b/deimos/docker.py index b268624..7d5eef0 100644 --- a/deimos/docker.py +++ b/deimos/docker.py @@ -108,7 +108,10 @@ def cgroups(cid): paths = [] paths += glob.glob("/sys/fs/cgroup/*/" + cid) paths += glob.glob("/sys/fs/cgroup/*/docker/" + cid) - return dict((s.split("/")[4], s) for s in paths) + paths += glob.glob("/cgroup/*/" + cid) + paths += glob.glob("/cgroup/*/docker/" + cid) + named_cgroups = [(s.split("/cgroup/")[1].split("/")[0], s) for s in paths] + return dict(named_cgroups) def matching_image_for_host(distro=None, release=None, *args, **kwargs):