summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMichael Schubert <schu@schu.io>2015-11-09 12:32:33 +0100
committerMichael Schubert <schu@schu.io>2015-11-10 11:08:24 +0100
commit8924319631445d25b5de885ea46c651522249de0 (patch)
tree16bc84c6271a095945157816eb066e9d4e2838f6 /docker
parent881e24c231ab9921eb0cbd475e85706137983f89 (diff)
downloaddocker-py-8924319631445d25b5de885ea46c651522249de0.tar.gz
create_host_config: allow setting oom_kill_disable
Signed-off-by: Michael Schubert <schu@schu.io>
Diffstat (limited to 'docker')
-rw-r--r--docker/utils/utils.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py
index 39d0eba..266104f 100644
--- a/docker/utils/utils.py
+++ b/docker/utils/utils.py
@@ -470,7 +470,7 @@ def parse_bytes(s):
def create_host_config(
- binds=None, port_bindings=None, lxc_conf=None,
+ binds=None, port_bindings=None, lxc_conf=None, oom_kill_disable=False,
publish_all_ports=False, links=None, privileged=False,
dns=None, dns_search=None, volumes_from=None, network_mode=None,
restart_policy=None, cap_add=None, cap_drop=None, devices=None,
@@ -511,6 +511,13 @@ def create_host_config(
if privileged:
host_config['Privileged'] = privileged
+ if oom_kill_disable:
+ if not version_gte(version, '1.19'):
+ raise errors.InvalidVersion(
+ 'oom_kill_disable param not supported for API version < 1.19'
+ )
+ host_config['OomKillDisable'] = oom_kill_disable
+
if publish_all_ports:
host_config['PublishAllPorts'] = publish_all_ports