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

Allow for more digests.

Browse Source
This commit is contained in:
Felix Fontein 2025-11-16 08:44:18 +01:00
parent a904bf2815
commit 930ef10ff8
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/modules/docker_image_remove.py
View File

@ -219,6 +219,7 @@ class ImageRemover(DockerBaseClass):
elif is_image_name_id(name): elif is_image_name_id(name):
deleted.append(image["Id"]) deleted.append(image["Id"])
# TODO: the following is no longer correct with Docker 29+...
untagged[:] = sorted( untagged[:] = sorted(
(image.get("RepoTags") or []) + (image.get("RepoDigests") or []) (image.get("RepoTags") or []) + (image.get("RepoDigests") or [])
) )

24
tests/integration/targets/docker_image_remove/tasks/main.yml
View File

@ -104,10 +104,11 @@
- remove_2 is changed - remove_2 is changed
- remove_2.diff.before.id == pulled_image.image.Id - remove_2.diff.before.id == pulled_image.image.Id
- remove_2.diff.before.tags | length == 4 - remove_2.diff.before.tags | length == 4
- remove_2.diff.before.digests | length == 1 # With Docker 29, there are now two digests in before and after:
- remove_2.diff.before.digests | length in [1, 2]
- remove_2.diff.after.id == pulled_image.image.Id - remove_2.diff.after.id == pulled_image.image.Id
- remove_2.diff.after.tags | length == 3 - remove_2.diff.after.tags | length == 3
- remove_2.diff.after.digests | length == 1 - remove_2.diff.after.digests | length in [1, 2]
- remove_2.deleted | length == 0 - remove_2.deleted | length == 0
- remove_2.untagged | length == 1 - remove_2.untagged | length == 1
- remove_2.untagged[0] == (iname_prefix ~ '-tagged-1:latest') - remove_2.untagged[0] == (iname_prefix ~ '-tagged-1:latest')
@ -176,10 +177,11 @@
- remove_4 is changed - remove_4 is changed
- remove_4.diff.before.id == pulled_image.image.Id - remove_4.diff.before.id == pulled_image.image.Id
- remove_4.diff.before.tags | length == 3 - remove_4.diff.before.tags | length == 3
- remove_4.diff.before.digests | length == 1 # With Docker 29, there are now two digests in before and after:
- remove_4.diff.before.digests | length in [1, 2]
- remove_4.diff.after.id == pulled_image.image.Id - remove_4.diff.after.id == pulled_image.image.Id
- remove_4.diff.after.tags | length == 2 - remove_4.diff.after.tags | length == 2
- remove_4.diff.after.digests | length == 1 - remove_4.diff.after.digests | length in [1, 2]
- remove_4.deleted | length == 0 - remove_4.deleted | length == 0
- remove_4.untagged | length == 1 - remove_4.untagged | length == 1
- remove_4.untagged[0] == (iname_prefix ~ '-tagged-1:foo') - remove_4.untagged[0] == (iname_prefix ~ '-tagged-1:foo')
@ -247,16 +249,22 @@
- remove_6 is changed - remove_6 is changed
- remove_6.diff.before.id == pulled_image.image.Id - remove_6.diff.before.id == pulled_image.image.Id
- remove_6.diff.before.tags | length == 2 - remove_6.diff.before.tags | length == 2
- remove_6.diff.before.digests | length == 1 # With Docker 29, there are now two digests in before and after:
- remove_6.diff.before.digests | length in [1, 2]
- remove_6.diff.after.exists is false - remove_6.diff.after.exists is false
- remove_6.deleted | length > 1 - remove_6.deleted | length >= 1
- pulled_image.image.Id in remove_6.deleted - pulled_image.image.Id in remove_6.deleted
- remove_6.untagged | length == 3 - remove_6.untagged | length in [2, 3]
- (iname_prefix ~ '-tagged-1:bar') in remove_6.untagged - (iname_prefix ~ '-tagged-1:bar') in remove_6.untagged
- image in remove_6.untagged - image in remove_6.untagged
- remove_6_check.deleted | length == 1 - remove_6_check.deleted | length == 1
- remove_6_check.deleted[0] == pulled_image.image.Id - remove_6_check.deleted[0] == pulled_image.image.Id
- remove_6_check.untagged == remove_6.untagged # The following is only true for Docker < 29...
# We use the CLI version as a proxy...
- >-
remove_6_check.untagged == remove_6.untagged
or
docker_cli_version is version("29.0.0", ">=")
- info_5.images | length == 0 - info_5.images | length == 0
- name: Remove image ID (force, idempotent, check mode) - name: Remove image ID (force, idempotent, check mode)