image/list: Show collapsed tree by default

Use the new tree view by default and only fallback if format or old
view-related options are used.

The expanded view is shown when `--tree` is passed.

Signed-off-by: Paweł Gronowski <[email protected]>

Author: vvoland

cli/command/image/list.go

@@ -85,23 +85,37 @@ func runImages(ctx context.Context, dockerCLI command.Cli, options imagesOptions
 		filters.Add("reference", options.matchName)
 	}
 
-	if options.tree {
-		if options.quiet {
+	useTree := true
+	if options.quiet {
+		if options.tree {
 			return errors.New("--quiet is not yet supported with --tree")
 		}
-		if options.noTrunc {
+		useTree = false
+	}
+	if options.noTrunc {
+		if options.tree {
 			return errors.New("--no-trunc is not yet supported with --tree")
 		}
-		if options.showDigests {
+		useTree = false
+	}
+	if options.showDigests {
+		if options.tree {
 			return errors.New("--show-digest is not yet supported with --tree")
 		}
-		if options.format != "" {
+		useTree = false
+	}
+	if options.format != "" {
+		if options.tree {
 			return errors.New("--format is not yet supported with --tree")
 		}
+		useTree = false
+	}
 
+	if useTree {
 		return runTree(ctx, dockerCLI, treeOptions{
-			all:     options.all,
-			filters: filters,
+			all:      options.all,
+			filters:  filters,
+			expanded: options.tree,
 		})
 	}
 

cli/command/image/tree.go

@@ -24,8 +24,9 @@ import (
 )
 
 type treeOptions struct {
-	all     bool
-	filters client.Filters
+	all      bool
+	filters  client.Filters
+	expanded bool
 }
 
 type treeView struct {
@@ -54,7 +55,7 @@ func runTree(ctx context.Context, dockerCLI command.Cli, opts treeOptions) error
 	attested := make(map[digest.Digest]bool)
 
 	for _, img := range images {
-		details := imageDetails{
+		topDetails := imageDetails{
 			ID:        img.ID,
 			DiskUsage: units.HumanSizeWithPrecision(float64(img.Size), 3),
 			InUse:     img.Containers > 0,
@@ -73,33 +74,38 @@ func runTree(ctx context.Context, dockerCLI command.Cli, opts treeOptions) error
 				continue
 			}
 
+			inUse := len(im.ImageData.Containers) > 0
+			if inUse {
+				// Mark top-level parent image as used if any of its subimages are used.
+				topDetails.InUse = true
+			}
+
+			if !opts.expanded {
+				continue
+			}
+
 			sub := subImage{
 				Platform:  platforms.Format(im.ImageData.Platform),
 				Available: im.Available,
 				Details: imageDetails{
 					ID:          im.ID,
 					DiskUsage:   units.HumanSizeWithPrecision(float64(im.Size.Total), 3),
-					InUse:       len(im.ImageData.Containers) > 0,
+					InUse:       inUse,
 					ContentSize: units.HumanSizeWithPrecision(float64(im.Size.Content), 3),
 				},
 			}
 
-			if sub.Details.InUse {
-				// Mark top-level parent image as used if any of its subimages are used.
-				details.InUse = true
-			}
-
 			children = append(children, sub)
 
 			// Add extra spacing between images if there's at least one entry with children.
 			view.imageSpacing = true
 		}
 
-		details.ContentSize = units.HumanSizeWithPrecision(float64(totalContent), 3)
+		topDetails.ContentSize = units.HumanSizeWithPrecision(float64(totalContent), 3)
 
 		view.images = append(view.images, topImage{
 			Names:    img.RepoTags,
-			Details:  details,
+			Details:  topDetails,
 			Children: children,
 			created:  img.Created,
 		})