Merge branch '2.0' into 2.1

gns3server/compute/docker/docker_vm.py

@@ -213,7 +213,7 @@ class DockerVM(BaseNode):
 
         self._volumes = ["/etc/network"]
 
-        volumes = image_infos.get("ContainerConfig", {}).get("Volumes")
+        volumes = image_infos.get("Config", {}).get("Volumes")
         if volumes is None:
             return binds
         for volume in volumes.keys():
@@ -361,7 +361,7 @@ class DockerVM(BaseNode):
                     try:
                         yield from self._add_ubridge_connection(nio, adapter_number)
                     except UbridgeNamespaceError:
-                        log.error("Container {} failed to start", self.name)
+                        log.error("Container %s failed to start", self.name)
                         yield from self.stop()
 
                         # The container can crash soon after the start, this means we can not move the interface to the container namespace