ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-21 00:22:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into 3.0

Browse Source 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
#	requirements.txt
This commit is contained in:
grossmj
2022-04-27 22:23:05 +07:00
parent 89c67790ae bccfb64958
commit df50b46952
30 changed files with 372 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gns3server/compute/docker/docker_vm.py
View File

@ -333,16 +333,17 @@ class DockerVM(BaseNode):
os.makedirs(os.path.join(path, "if-down.d"), exist_ok=True)
os.makedirs(os.path.join(path, "if-pre-up.d"), exist_ok=True)
os.makedirs(os.path.join(path, "if-post-down.d"), exist_ok=True)
os.makedirs(os.path.join(path, "interfaces.d"), exist_ok=True)
if not os.path.exists(os.path.join(path, "interfaces")):
with open(os.path.join(path, "interfaces"), "w+") as f:
f.write(
"""#
# This is a sample network config uncomment lines to configure the network
f.write("""#
# This is a sample network config, please uncomment lines to configure the network
#
"""
)
# Uncomment this line to load custom interface files
# source /etc/network/interfaces.d/*
""")
for adapter in range(0, self.adapters):
f.write(
"""
@ -355,11 +356,9 @@ class DockerVM(BaseNode):
#\tup echo nameserver 192.168.{adapter}.1 > /etc/resolv.conf
# DHCP config for eth{adapter}
# auto eth{adapter}
# iface eth{adapter} inet dhcp""".format(
adapter=adapter
)
)
#auto eth{adapter}
#iface eth{adapter} inet dhcp
""".format(adapter=adapter))
return path
async def create(self):