Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle
2016-06-06 14:28:21 +02:00
3 changed files with 28 additions and 19 deletions

View File

@ -206,7 +206,7 @@ class DockerVM(BaseNode):
# We mount our own etc/network
network_config = self._create_network_config()
binds.append("{}:/etc/network:rw".format(network_config))
binds.append("{}:/gns3volumes/etc/network:rw".format(network_config))
self._volumes = ["/etc/network"]
@ -216,7 +216,7 @@ class DockerVM(BaseNode):
for volume in volumes.keys():
source = os.path.join(self.working_dir, os.path.relpath(volume, "/"))
os.makedirs(source, exist_ok=True)
binds.append("{}:{}".format(source, volume))
binds.append("{}:/gns3volumes{}".format(source, volume))
self._volumes.append(volume)
return binds