[docker,podman] Collect container image layers

Adds collection of container image layers for the docker and podman plugins via the `history` and `tree` subcommands repsectively. Related: #3796 Signed-off-by: Jake Hunsaker <[email protected]>
sosreport · Oct 16, 2024 · 58d7824 · 58d7824
1 parent a642018
commit 58d7824
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/sos/report/plugins/docker.py b/sos/report/plugins/docker.py
@@ -97,6 +97,11 @@ def setup(self):
             insp = name if 'none' not in name else img_id
             self.add_cmd_output(f"docker inspect {insp}", subdir='images',
                                 tags="docker_image_inspect")
+            self.add_cmd_output(
+                f"docker image history {insp}",
+                subdir='images/history',
+                tags='docker_image_tree'
+            )
 
         for vol in volumes:
             self.add_cmd_output(f"docker volume inspect {vol}",

diff --git a/sos/report/plugins/podman.py b/sos/report/plugins/podman.py
@@ -62,6 +62,7 @@ def setup(self):
 
         subcmds = [
             'info',
+            'image trust show',
             'images',
             'images --digests',
             'pod ps',
@@ -109,6 +110,11 @@ def setup(self):
             insp = name if 'none' not in name else img_id
             self.add_cmd_output(f"podman inspect {insp}", subdir='images',
                                 tags='podman_image_inspect')
+            self.add_cmd_output(
+                f"podman image tree {insp}",
+                subdir='images/tree',
+                tags='podman_image_tree'
+            )
 
         for vol in volumes:
             self.add_cmd_output(f"podman volume inspect {vol}",