mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
docker_image: allow to delete image by ID (#47393)
* Allow to delete docker image by ID. * Added changelog.
This commit is contained in:
parent
4ffe3b14d4
commit
a11073df9a
2 changed files with 16 additions and 8 deletions
2
changelogs/fragments/47393-docker_image-id.yaml
Normal file
2
changelogs/fragments/47393-docker_image-id.yaml
Normal file
|
@ -0,0 +1,2 @@
|
|||
minor_changes:
|
||||
- "docker_image - Allow to use image ID instead of image name for deleting images."
|
|
@ -250,7 +250,9 @@ image:
|
|||
import os
|
||||
import re
|
||||
|
||||
from ansible.module_utils.docker_common import HAS_DOCKER_PY_2, HAS_DOCKER_PY_3, AnsibleDockerClient, DockerBaseClass
|
||||
from ansible.module_utils.docker_common import (
|
||||
HAS_DOCKER_PY_2, HAS_DOCKER_PY_3, AnsibleDockerClient, DockerBaseClass, is_image_name_id,
|
||||
)
|
||||
from ansible.module_utils._text import to_native
|
||||
|
||||
try:
|
||||
|
@ -293,10 +295,11 @@ class ImageManager(DockerBaseClass):
|
|||
self.buildargs = parameters.get('buildargs')
|
||||
|
||||
# If name contains a tag, it takes precedence over tag parameter.
|
||||
repo, repo_tag = parse_repository_tag(self.name)
|
||||
if repo_tag:
|
||||
self.name = repo
|
||||
self.tag = repo_tag
|
||||
if not is_image_name_id(self.name):
|
||||
repo, repo_tag = parse_repository_tag(self.name)
|
||||
if repo_tag:
|
||||
self.name = repo
|
||||
self.tag = repo_tag
|
||||
|
||||
if self.state in ['present', 'build']:
|
||||
self.present()
|
||||
|
@ -363,11 +366,14 @@ class ImageManager(DockerBaseClass):
|
|||
|
||||
:return None
|
||||
'''
|
||||
image = self.client.find_image(self.name, self.tag)
|
||||
if image:
|
||||
name = self.name
|
||||
name = self.name
|
||||
if is_image_name_id(name):
|
||||
image = self.client.find_image_by_id(name)
|
||||
else:
|
||||
image = self.client.find_image(name, self.tag)
|
||||
if self.tag:
|
||||
name = "%s:%s" % (self.name, self.tag)
|
||||
if image:
|
||||
if not self.check_mode:
|
||||
try:
|
||||
self.client.remove_image(name, force=self.force)
|
||||
|
|
Loading…
Reference in a new issue