From 226bb87a64269e4afa559afb402389fc5dcc2e95 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Tue, 20 Oct 2015 21:10:44 -0500 Subject: [PATCH] Add support for MemorySwappiness to create_host_config Signed-off-by: Dustin Falgout --- docker/utils/utils.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/utils/utils.py b/docker/utils/utils.py index 89837b782a..f76287542f 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -476,9 +476,9 @@ 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, cgroup_parent=None, group_add=None, cpu_quota=None, - cpu_period=None, version=None -): + memswap_limit=None, mem_swappiness=None, cgroup_parent=None, + group_add=None, cpu_quota=None, cpu_period=None, version=None + ): host_config = {} if not version: @@ -497,6 +497,11 @@ def create_host_config( if isinstance(memswap_limit, six.string_types): memswap_limit = parse_bytes(memswap_limit) host_config['MemorySwap'] = memswap_limit + + if mem_swappiness is not None: + if isinstance(mem_swappiness, six.string_types): + mem_swappiness = parse_bytes(mem_swappiness) + host_config['MemorySwappiness'] = mem_swappiness if pid_mode not in (None, 'host'): raise errors.DockerException(