summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMohit Soni <mohitsoni1989@gmail.com>2015-08-16 10:30:07 -0700
committerJoffrey F <joffrey@docker.com>2015-08-24 14:43:05 -0700
commit3caaa0050b044462157b755f3810e44857d73761 (patch)
treef24f63fd4e2f8881a2e3d6d243ce22985c7f9369 /docker
parent4008cbce7131b6c33aec61035050e2adf975d4a3 (diff)
downloaddocker-py-3caaa0050b044462157b755f3810e44857d73761.tar.gz
Added support for cgroup parent
Clean up cgroup_parent usage
Diffstat (limited to 'docker')
-rw-r--r--docker/utils/utils.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py
index 8ac38e3..a3b63f4 100644
--- a/docker/utils/utils.py
+++ b/docker/utils/utils.py
@@ -395,7 +395,7 @@ def create_host_config(
restart_policy=None, cap_add=None, cap_drop=None, devices=None,
extra_hosts=None, read_only=None, pid_mode=None, ipc_mode=None,
security_opt=None, ulimits=None, log_config=None, mem_limit=None,
- memswap_limit=None
+ memswap_limit=None, cgroup_parent=None
):
host_config = {}
@@ -500,6 +500,9 @@ def create_host_config(
if lxc_conf is not None:
host_config['LxcConf'] = lxc_conf
+ if cgroup_parent is not None:
+ host_config['CgroupParent'] = cgroup_parent
+
if ulimits is not None:
if not isinstance(ulimits, list):
raise errors.DockerException(