Merge pull request #400 from adeslade/create-container-with-extra-hosts

Allow ExtraHosts to be specified when creating a container

Author: shin-

docker/client.py

@@ -899,7 +899,8 @@ def search(self, term):
     def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
               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):
+              restart_policy=None, cap_add=None, cap_drop=None, devices=None,
+              extra_hosts=None):
         if isinstance(container, dict):
             container = container.get('Id')
 
@@ -932,6 +933,16 @@ def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 
             start_config['Links'] = formatted_links
 
+        if extra_hosts:
+            if isinstance(extra_hosts, dict):
+                extra_hosts = six.iteritems(extra_hosts)
+
+            formatted_extra_hosts = [
+                '{0}:{1}'.format(k, v) for k, v in sorted(extra_hosts)
+            ]
+
+            start_config['ExtraHosts'] = formatted_extra_hosts
+
         start_config['Privileged'] = privileged
 
         if utils.compare_version('1.10', self._version) >= 0: