ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-04-07 10:43:03 +00:00
Code Packages Projects Releases Wiki Activity

Fix pull idempotency.

Browse Source
This commit is contained in:
Felix Fontein 2025-11-13 19:34:04 +01:00
parent 64020149bf
commit 40036f9fda
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/1192-docker_container-pull.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- "docker_container - fix ``pull`` idempotency with Docker 29.0.0 (https://github.com/ansible-collections/community.docker/pull/1192)."

15
plugins/module_utils/_common_api.py
View File

@ -519,6 +519,15 @@ class AnsibleDockerClientBase(Client):
except Exception as exc: # pylint: disable=broad-exception-caught except Exception as exc: # pylint: disable=broad-exception-caught
self.fail(f"Error inspecting image ID {image_id} - {exc}") self.fail(f"Error inspecting image ID {image_id} - {exc}")
@staticmethod
def _compare_images(img1: dict[str, t.Any] | None, img2: dict[str, t.Any] | None) -> bool:
if img1 is None or img2 is None:
return img1 == img2
filter_keys = {"metadata"}
img1_filtered = {k: v for k, v in img1.items() if k not in filter_keys}
img2_filtered = {k: v for k, v in img2.items() if k not in filter_keys}
return img1_filtered == img2_filtered
def pull_image( def pull_image(
self, name: str, tag: str = "latest", image_platform: str | None = None self, name: str, tag: str = "latest", image_platform: str | None = None
) -> tuple[dict[str, t.Any] | None, bool]: ) -> tuple[dict[str, t.Any] | None, bool]:
@ -526,7 +535,7 @@ class AnsibleDockerClientBase(Client):
Pull an image Pull an image
""" """
self.log(f"Pulling image {name}:{tag}") self.log(f"Pulling image {name}:{tag}")
old_tag = self.find_image(name, tag) old_image = self.find_image(name, tag)
try: try:
repository, image_tag = parse_repository_tag(name) repository, image_tag = parse_repository_tag(name)
registry, dummy_repo_name = auth.resolve_repository_name(repository) registry, dummy_repo_name = auth.resolve_repository_name(repository)
@ -563,9 +572,9 @@ class AnsibleDockerClientBase(Client):
except Exception as exc: # pylint: disable=broad-exception-caught except Exception as exc: # pylint: disable=broad-exception-caught
self.fail(f"Error pulling image {name}:{tag} - {exc}") self.fail(f"Error pulling image {name}:{tag} - {exc}")
new_tag = self.find_image(name, tag) new_image = self.find_image(name, tag)
return new_tag, old_tag == new_tag return new_image, self._compare_images(old_image, new_image)
class AnsibleDockerClient(AnsibleDockerClientBase): class AnsibleDockerClient(AnsibleDockerClientBase):