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/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/web/route.py
#	requirements.txt
#	tests/compute/docker/test_docker_vm.py
This commit is contained in:
grossmj
2023-09-06 23:30:00 +07:00
parent 0c12849d0d 285b19d97f
commit 1ec056c1a6
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,8 +488,8 @@ class DockerVM(BaseNode):
params["Env"].append(f"DISPLAY=:{self._display}")
params["HostConfig"]["Mounts"].append({
"Type": "bind",
"Source": "/tmp/.X11-unix/",
"Target": "/tmp/.X11-unix/"
"Source": f"/tmp/.X11-unix/X{self._display}",
"Target": f"/tmp/.X11-unix/X{self._display}"
})
if self._extra_hosts: