NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-06 07:11:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merging 2.1 into 2.2

Browse Source
This commit is contained in:
grossmj committed 2019-02-22 18:04:49 +07:00
2 parents 3e601a8a24 62c51edbae
commit 5754747a90
16 files changed
+102 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/compute/docker/__init__.py
+4 -1
View File
@@ -198,7 +198,10 @@ class Docker(BaseManager):
if progress_callback:
progress_callback("Pulling '{}' from docker hub".format(image))
response = await self.http_query("POST", "images/create", params={"fromImage": image}, timeout=None)
try:
response = await self.http_query("POST", "images/create", params={"fromImage": image}, timeout=None)
except DockerError as e:
raise DockerError("Could not pull the '{}' image from Docker Hub, please check your Internet connection (original error: {})".format(image, e))
# The pull api will stream status via an HTTP JSON stream
content = ""
while True: