Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions docker/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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(
Expand Down