From ad26d98086ba516a28ce9d3c166da70807cdeb97 Mon Sep 17 00:00:00 2001 From: Jake Hunsaker Date: Wed, 10 May 2017 08:18:49 -0400 Subject: [docker] Collect image inspect output (#995) Adds output for 'docker inspect' for each unique image on the host. Signed-off-by: Jake Hunsaker Signed-off-by: Adam Stokes --- sos/plugins/docker.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py index ffe5cfce..6e5a0b2e 100644 --- a/sos/plugins/docker.py +++ b/sos/plugins/docker.py @@ -77,10 +77,18 @@ class Docker(Plugin): if self.get_option('all'): ps_cmd = "{0} -a".format(ps_cmd) - result = self.get_command_output(ps_cmd) - if result['status'] == 0: - containers = [c for c in result['output'].splitlines()] - for container in containers: + img_cmd = '{0} images -q'.format(self.docker_cmd) + insp = set() + + for icmd in [ps_cmd, img_cmd]: + result = self.get_command_output(icmd) + if result['status'] == 0: + for con in result['output'].splitlines(): + insp.add(con) + + insp = list(insp) + if insp: + for container in insp: self.add_cmd_output( "{0} inspect {1}".format( self.docker_cmd, -- cgit