From 0e89ff56a8586b0666a1f3b6a703f17575d78ebd Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 16 Apr 2025 17:42:40 +0700 Subject: [PATCH] Replace "Docker hub" by "Docker repository" because it is possible to use different repositories --- gns3server/compute/docker/__init__.py | 8 ++++---- gns3server/compute/docker/docker_vm.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gns3server/compute/docker/__init__.py b/gns3server/compute/docker/__init__.py index 66a1390b..79c077f1 100644 --- a/gns3server/compute/docker/__init__.py +++ b/gns3server/compute/docker/__init__.py @@ -261,21 +261,21 @@ class Docker(BaseManager): pass if progress_callback: - progress_callback("Pulling '{}' from docker hub".format(image)) + progress_callback("Pulling '{}' from Docker repository".format(image)) 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)) + raise DockerError("Could not pull the '{}' image from Docker repository, please check your Internet connection (original error: {})".format(image, e)) # The pull api will stream status via an HTTP JSON stream content = "" while True: try: chunk = await response.content.read(CHUNK_SIZE) except aiohttp.ServerDisconnectedError: - log.error("Disconnected from server while pulling Docker image '{}' from docker hub".format(image)) + log.error("Disconnected from server while pulling Docker image '{}' from Docker repository".format(image)) break except asyncio.TimeoutError: - log.error("Timeout while pulling Docker image '{}' from docker hub".format(image)) + log.error("Timeout while pulling Docker image '{}' from Docker repository".format(image)) break if not chunk: break diff --git a/gns3server/compute/docker/docker_vm.py b/gns3server/compute/docker/docker_vm.py index 24a70e94..3f2c88ba 100644 --- a/gns3server/compute/docker/docker_vm.py +++ b/gns3server/compute/docker/docker_vm.py @@ -365,7 +365,7 @@ class DockerVM(BaseNode): try: image_infos = await self._get_image_information() except DockerHttp404Error: - log.info("Image '{}' is missing, pulling it from Docker hub...".format(self._image)) + log.info("Image '{}' is missing, pulling it from Docker repository...".format(self._image)) await self.pull_image(self._image) image_infos = await self._get_image_information()