diff --git a/gns3server/compute/docker/__init__.py b/gns3server/compute/docker/__init__.py index b6c13448..459aae26 100644 --- a/gns3server/compute/docker/__init__.py +++ b/gns3server/compute/docker/__init__.py @@ -267,12 +267,12 @@ class Docker(BaseManager): pass if progress_callback: - progress_callback(f"Pulling '{image}' from docker hub") + progress_callback(f"Pulling '{image}' from Docker repository") try: response = await self.http_query("POST", "images/create", params={"fromImage": image}, timeout=None) except DockerError as e: raise DockerError( - f"Could not pull the '{image}' image from Docker Hub, " + f"Could not pull the '{image}' image from Docker repository, " f"please check your Internet connection (original error: {e})" ) # The pull api will stream status via an HTTP JSON stream @@ -281,10 +281,10 @@ class Docker(BaseManager): try: chunk = await response.content.read(CHUNK_SIZE) except aiohttp.ServerDisconnectedError: - log.error(f"Disconnected from server while pulling Docker image '{image}' from docker hub") + log.error(f"Disconnected from server while pulling Docker image '{image}' from Docker repository") break except asyncio.TimeoutError: - log.error(f"Timeout while pulling Docker image '{image}' from docker hub") + 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 4dbced0e..dc12dde9 100644 --- a/gns3server/compute/docker/docker_vm.py +++ b/gns3server/compute/docker/docker_vm.py @@ -437,7 +437,7 @@ class DockerVM(BaseNode): try: image_infos = await self._get_image_information() except DockerHttp404Error: - log.info(f"Image '{self._image}' is missing, pulling it from Docker hub...") + 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()