Merge branch '1.5' into 2.0

gns3server/compute/docker/__init__.py

@@ -116,11 +116,11 @@ class Docker(BaseManager):
                 pass
             log.debug("Query Docker %s %s params=%s data=%s Response: %s", method, path, params, data, body)
             if response.status == 304:
-                raise DockerHttp304Error("Docker has returned an error: {} {}".format(response.status, body))
+                raise DockerHttp304Error("Docker has returned an error: {} {}".format(response.status, body))
             elif response.status == 404:
-                raise DockerHttp404Error("Docker has returned an error: {} {}".format(response.status, body))
+                raise DockerHttp404Error("Docker has returned an error: {} {}".format(response.status, body))
             else:
-                raise DockerError("Docker has returned an error: {} {}".format(response.status, body))
+                raise DockerError("Docker has returned an error: {} {}".format(response.status, body))
         return response
 
     @asyncio.coroutine

gns3server/compute/docker/docker_vm.py

@@ -368,7 +368,7 @@ class DockerVM(BaseNode):
         """
 
         # We can not use the API because docker doesn't expose a websocket api for exec
-        # https://github.com/GNS3/gns3-gui/issues/1039
+        # https://github.com/GNS3/gns3-gui/issues/1039
         process = yield from asyncio.subprocess.create_subprocess_exec(
             "docker", "exec", "-i", self._cid, "/gns3/bin/busybox", "script", "-qfc", "/gns3/bin/busybox sh", "/dev/null",
             stdout=asyncio.subprocess.PIPE,

gns3server/compute/docker/resources/init.sh

@@ -17,7 +17,7 @@
 
 #
 # This script is injected into the container and launch before
-# the start command of the container
+# the start command of the container
 #
 OLD_PATH="$PATH"
 PATH=/gns3/bin:/tmp/gns3/bin