Merge pull request #614 from ibuildthecloud/extra-host-list

shin- · shin- · commit ed07b053e92c · 2015-06-18T12:30:21.000-07:00
Allow extra_hosts to be a list too
diff --git 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):

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,7 @@ def create_host_config(`
`450`	`450`	`for k, v in sorted(six.iteritems(extra_hosts))`
`451`	`451`	`]`
`452`	`452`
`453`		`- host_config['ExtraHosts'] = extra_hosts`
	`453`	`+ host_config['ExtraHosts'] = extra_hosts`
`454`	`454`
`455`	`455`	`if links is not None:`
`456`	`456`	`if isinstance(links, dict):`