ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-09-12 19:07:24 +00:00
Code Packages Projects Releases Wiki Activity

Do not fail on empty 'docker compose images' output. (#1305) (#1306)

Browse Source 
(cherry picked from commit bc8f6a6906)
This commit is contained in:
Felix Fontein
2026-08-07 15:52:47 +02:00
committed by GitHub
parent f63dc58469
commit 47b993ab4b
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/module_utils/common_cli.py
+4 -1
View File
@@ -124,12 +124,15 @@ class AnsibleDockerClientBase(object):
# Python 2.7 does not like anything than '**kwargs' after '*args', so we have to do this manually...
pass
# def call_cli_json(self, *args, check_rc=False, data=None, cwd=None, environ_update=None, warn_on_stderr=False):
# def call_cli_json(self, *args, check_rc=False, data=None, cwd=None, environ_update=None, warn_on_stderr=False, parse_empty_as_none=False):
def call_cli_json(self, *args, **kwargs):
warn_on_stderr = kwargs.pop('warn_on_stderr', False)
parse_empty_as_none = kwargs.pop('parse_empty_as_none', False)
rc, stdout, stderr = self.call_cli(*args, **kwargs)
if warn_on_stderr and stderr:
self.warn(to_native(stderr))
if parse_empty_as_none and not stdout.strip():
return rc, None, stderr
try:
data = json.loads(stdout)
except Exception as exc: