Add support of ExtraHosts for Docker, Ref. gns3-gui#2482

gns3server/compute/docker/docker_vm.py

@@ -61,11 +61,12 @@ class DockerVM(BaseNode):
     :param console_resolution: Resolution of the VNC display
     :param console_http_port: Port to redirect HTTP queries
     :param console_http_path: Url part with the path of the web interface
+    :param extra_hosts: Hosts which will be written into /etc/hosts into docker conainer
     """
 
     def __init__(self, name, node_id, project, manager, image, console=None, aux=None, start_command=None,
                  adapters=None, environment=None, console_type="telnet", console_resolution="1024x768",
-                 console_http_port=80, console_http_path="/"):
+                 console_http_port=80, console_http_path="/", extra_hosts=None):
 
         super().__init__(name, node_id, project, manager, console=console, aux=aux, allocate_aux=True, console_type=console_type)
 
@@ -84,6 +85,8 @@ class DockerVM(BaseNode):
         self._console_http_path = console_http_path
         self._console_http_port = console_http_port
         self._console_websocket = None
+        self._extra_hosts = extra_hosts
+
         self._volumes = []
         # Keep a list of created bridge
         self._bridges = set()
@@ -114,7 +117,8 @@ class DockerVM(BaseNode):
             "start_command": self.start_command,
             "status": self.status,
             "environment": self.environment,
-            "node_directory": self.working_path
+            "node_directory": self.working_path,
+            "extra_hosts": self.extra_hosts
         }
 
     def _get_free_display_port(self):
@@ -178,6 +182,14 @@ class DockerVM(BaseNode):
     def environment(self, command):
         self._environment = command
 
+    @property
+    def extra_hosts(self):
+        return self._extra_hosts
+
+    @extra_hosts.setter
+    def extra_hosts(self, extra_hosts):
+        self._extra_hosts = extra_hosts
+
     @asyncio.coroutine
     def _get_container_state(self):
         """Returns the container state (e.g. running, paused etc.)
@@ -288,7 +300,7 @@ class DockerVM(BaseNode):
             "HostConfig": {
                 "CapAdd": ["ALL"],
                 "Privileged": True,
-                "Binds": self._mount_binds(image_infos)
+                "Binds": self._mount_binds(image_infos),
             },
             "Volumes": {},
             "Env": ["container=docker"],  # Systemd compliant: https://github.com/GNS3/gns3-server/issues/573
@@ -325,6 +337,12 @@ class DockerVM(BaseNode):
             params["Env"].append("DISPLAY=:{}".format(self._display))
             params["HostConfig"]["Binds"].append("/tmp/.X11-unix/:/tmp/.X11-unix/")
 
+        if self._extra_hosts is not None and self._extra_hosts.strip() != "":
+            params["HostConfig"]["ExtraHosts"] = [h.strip()
+                                                  for h in self._extra_hosts.split("\n")
+                                                  if h.strip() != "" ]
+
+
         result = yield from self.manager.query("POST", "containers/create", data=params)
         self._cid = result['Id']
         log.info("Docker container '{name}' [{id}] created".format(

gns3server/handlers/api/compute/docker_handler.py

@@ -60,7 +60,8 @@ class DockerHandler:
                                                           console_resolution=request.json.get("console_resolution", "1024x768"),
                                                           console_http_port=request.json.get("console_http_port", 80),
                                                           console_http_path=request.json.get("console_http_path", "/"),
-                                                          aux=request.json.get("aux"))
+                                                          aux=request.json.get("aux"),
+                                                          extra_hosts=request.json.get("extra_hosts"))
         for name, value in request.json.items():
             if name != "node_id":
                 if hasattr(container, name) and getattr(container, name) != value:
@@ -312,7 +313,7 @@ class DockerHandler:
         props = [
             "name", "console", "aux", "console_type", "console_resolution",
             "console_http_port", "console_http_path", "start_command",
-            "environment", "adapters"
+            "environment", "adapters", "extra_hosts"
         ]
 
         changed = False

gns3server/schemas/docker.py

@@ -87,6 +87,11 @@ DOCKER_CREATE_SCHEMA = {
             "type": ["string", "null"],
             "minLength": 0,
         },
+        "extra_hosts": {
+            "description": "Docker extra hosts (added to /etc/hosts)",
+            "type": ["string", "null"],
+            "minLength": 0,
+        },
         "container_id": {
             "description": "Docker container ID Read only",
             "type": "string",
@@ -184,6 +189,11 @@ DOCKER_OBJECT_SCHEMA = {
             "type": ["string", "null"],
             "minLength": 0,
         },
+        "extra_hosts": {
+            "description": "Docker extra hosts (added to /etc/hosts)",
+            "type": ["string", "null"],
+            "minLength": 0,
+        },
         "node_directory": {
             "description": "Path to the node working directory  Read only",
             "type": "string"