arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-25 00:08:11 +00:00
Code Issues Releases Wiki Activity

Use a stock BusyBox for the Docker Integration

Browse Source
This commit is contained in:
grossmj 2021-06-03 18:38:08 +09:30
parent 8be015cd86
commit 9b0e3a77ed
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -574,15 +574,9 @@ class DockerVM(BaseNode):
# https://github.com/GNS3/gns3-gui/issues/1039 # https://github.com/GNS3/gns3-gui/issues/1039
try: try:
process = await asyncio.subprocess.create_subprocess_exec( process = await asyncio.subprocess.create_subprocess_exec(
"docker",
"exec",
"-i",
self._cid,
"/gns3/bin/busybox",
"script", "script",
"-qfc", "-qfc",
"while true; do TERM=vt100 /gns3/bin/busybox sh; done", f"docker exec -i -t {self._cid} /gns3/bin/busybox sh -c 'while true; do TERM=vt100 /gns3/bin/busybox sh; done'", "/dev/null",
"/dev/null",
stdout=asyncio.subprocess.PIPE, stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.STDOUT, stderr=asyncio.subprocess.STDOUT,
stdin=asyncio.subprocess.PIPE, stdin=asyncio.subprocess.PIPE,

8
gns3server/compute/docker/resources/bin/udhcpc Normal file
View File

@ -0,0 +1,8 @@
#!/gns3/bin/busybox sh
SCRIPT="/gns3/etc/udhcpc/default.script"
EXTRA=""
[ "$(cat "/proc/$PPID/comm" 2>/dev/null)" = ifup ] && EXTRA="-t 3 -T 2 -A 1 -b"
exec /tmp/gns3/bin/udhcpc -s "$SCRIPT" $EXTRA "$@"