Stop relying on deprecated field when parsing image pulling errors. (#1302)

This commit is contained in:
Felix Fontein
2026-08-04 21:26:51 +02:00
committed by GitHub
parent 67076499a2
commit b7b684b9c5
3 changed files with 6 additions and 2 deletions
@@ -0,0 +1,4 @@
bugfixes:
- "docker_image, docker_image_pull, docker_container - also handle errors if only ``errorDetail`` is set, but not ``error``.
The ``error`` field has been `deprecated in Moby apparently a very long time ago <https://github.com/moby/moby/commit/3043c2641990d94298c6377b7ef14709263a4709>`__
(https://github.com/ansible-collections/community.docker/pull/1302)."
+1 -1
View File
@@ -564,7 +564,7 @@ class AnsibleDockerClientBase(Client):
self._raise_for_status(response) self._raise_for_status(response)
for line in self._stream_helper(response, decode=True): for line in self._stream_helper(response, decode=True):
self.log(line, pretty_print=True) self.log(line, pretty_print=True)
if line.get("error"): if line.get("error") or line.get("errorDetail"):
if line.get("errorDetail"): if line.get("errorDetail"):
error_detail = line.get("errorDetail") error_detail = line.get("errorDetail")
self.fail( self.fail(
+1 -1
View File
@@ -995,7 +995,7 @@ class ImageManager(DockerBaseClass):
self.log(line, pretty_print=True) self.log(line, pretty_print=True)
self._extract_output_line(line, build_output) self._extract_output_line(line, build_output)
if line.get("error"): if line.get("error") or line.get("errorDetail"):
if line.get("errorDetail"): if line.get("errorDetail"):
error_detail = line.get("errorDetail") error_detail = line.get("errorDetail")
self.fail( self.fail(