summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2015-06-18 12:30:21 -0700
committerJoffrey F <f.joffrey@gmail.com>2015-06-18 12:30:21 -0700
commited07b053e92c11d22226782a1e5482e6c93a7bcf (patch)
tree32f9184efc7ae63b40c7ab04c4b1407371a8efc9
parent54e48662a50127c667e4455e530c38613a609221 (diff)
parentfb2b7078eb8d95f4ebcd2b992af01f4a49295707 (diff)
downloaddocker-py-ed07b053e92c11d22226782a1e5482e6c93a7bcf.tar.gz
Merge pull request #614 from ibuildthecloud/extra-host-list
Allow extra_hosts to be a list too
-rw-r--r--docker/utils/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py
index 77bd7f3..b322806 100644
--- a/docker/utils/utils.py
+++ b/docker/utils/utils.py
@@ -450,7 +450,7 @@ def create_host_config(
for k, v in sorted(six.iteritems(extra_hosts))
]
- host_config['ExtraHosts'] = extra_hosts
+ host_config['ExtraHosts'] = extra_hosts
if links is not None:
if isinstance(links, dict):