[docker] Update plugin to utilize policy container runtime

Updates the plugin to use the new `ContainerRuntime` abstraction
provided by the loaded `Policy` rather than shelling out again to get
the same data loaded during `Policy` initialization.

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

1 files changed, 7 insertions, 20 deletions

diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py
index 7424fbba..74843ab2 100644
--- a/sos/plugins/docker.py
+++ b/sos/plugins/docker.py
@@ -73,17 +73,12 @@ class Docker(Plugin):
             for net in n:
                 self.add_cmd_output("docker network inspect %s" % net)
 
-        ps_cmd = 'docker ps -q'
-        if self.get_option('all'):
-            ps_cmd = "%s -a" % ps_cmd
-
-        fmt = '{{lower .Repository}}:{{lower .Tag}} {{lower .ID}}'
-        img_cmd = "docker images --format='%s'" % fmt
-        vol_cmd = 'docker volume ls -q'
-
-        containers = self._get_docker_list(ps_cmd)
-        images = self._get_docker_list(img_cmd)
-        volumes = self._get_docker_list(vol_cmd)
+        containers = [
+            c[0] for c in self.get_containers(runtime='docker',
+                                              get_all=self.get_option('all'))
+        ]
+        images = self.get_container_images(runtime='docker')
+        volumes = self.get_container_volumes(runtime='docker')
 
         for container in containers:
             self.add_cmd_output("docker inspect %s" % container,
@@ -93,7 +88,7 @@ class Docker(Plugin):
                                     subdir='containers')
 
         for img in images:
-            name, img_id = img.strip().split()
+            name, img_id = img
             insp = name if 'none' not in name else img_id
             self.add_cmd_output("docker inspect %s" % insp, subdir='images')
 
@@ -101,14 +96,6 @@ class Docker(Plugin):
             self.add_cmd_output("docker volume inspect %s" % vol,
                                 subdir='volumes')
 
-    def _get_docker_list(self, cmd):
-        ret = []
-        result = self.exec_cmd(cmd)
-        if result['status'] == 0:
-            for ent in result['output'].splitlines():
-                ret.append(ent)
-        return ret
-
     def postproc(self):
         # Attempts to match key=value pairs inside container inspect output
         # for potentially sensitive items like env vars that contain passwords.