Merge branch '2.2' into 3.0

# Conflicts:
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/docker/docker_vm.py
#	requirements.txt
This commit is contained in:
grossmj committed 2025-04-16 17:53:44 +07:00
commit 0e8d969cd2
2 files changed
+5 -5

No files matched your search

+1 -1
View File
@@ -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()