Merge branch '2.2' into 3.0

# Conflicts:
#	.github/workflows/testing.yml
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/run.py
#	requirements.txt
#	setup.py
#	tests/compute/docker/test_docker_vm.py
This commit is contained in:
grossmj committed 2024-02-21 12:24:30 +08:00
commit 800920e3df
2 files changed
+13 -5

No files matched your search

+2 -2
View File
@@ -193,8 +193,8 @@ class Docker(BaseManager):
if timeout is None:
timeout = 60 * 60 * 24 * 31 # One month timeout
if path == "version":
url = "http://docker/v1.12/" + path # API of docker v1.0
if path == 'version':
url = "http://docker/v1.24/" + path
else:
url = "http://docker/v" + DOCKER_MINIMUM_API_VERSION + "/" + path
try: