summaryrefslogtreecommitdiff
path: root/docker/utils/utils.py
diff options
context:
space:
mode:
authorJohn Howard <jhoward@microsoft.com>2015-07-15 12:11:54 -0700
committerJohn Howard <jhoward@microsoft.com>2015-07-28 15:18:12 -0700
commit8f1a82faeb46cf4eeb3c97bf8cc6a7f0a9105e89 (patch)
tree1975604ab48cc549cefa3cb4dab162cac18ec59d /docker/utils/utils.py
parentf8ad2dabf21be0d3c07e7d289fb09fb4d93de9a4 (diff)
downloaddocker-py-8f1a82faeb46cf4eeb3c97bf8cc6a7f0a9105e89.tar.gz
Add netmode (required by docker)
Signed-off-by: John Howard <jhoward@microsoft.com>
Diffstat (limited to 'docker/utils/utils.py')
-rw-r--r--docker/utils/utils.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py
index a714c97..396c245 100644
--- a/docker/utils/utils.py
+++ b/docker/utils/utils.py
@@ -615,6 +615,16 @@ def create_container_config(
if volumes_from is not None:
raise errors.InvalidVersion(message.format('volumes_from'))
+ # NetworkMode must be present and valid in host config from 1.20 onwards
+ if compare_version('1.20', version) >= 0:
+ if host_config is None:
+ host_config = {'NetworkMode': 'default'}
+ else:
+ if 'NetworkMode' not in host_config:
+ host_config['NetworkMode'] = 'default'
+ elif host_config['NetworkMode'] == '':
+ host_config['NetworkMode'] = 'default'
+
return {
'Hostname': hostname,
'Domainname': domainname,