Before this patch, `docker image ls` / `docker image ls` would always
show untagged images, but hide "dangling" images (which effectively
only were produced by the legacy builder) unless `-a` / `--all` was
used. This often resulted in many `<none>:<none>` or `<untagged>` images
to be shown, which had little value to interact with, other than to
garbage collect (`docker system prune`).
In future, we want to take more advantage of containerd's garbage-collecting
features (removing unused images automatically), and this UX change is
a stepping stone toward that.
For now, this patch only changes the behavior for `docker image ls --tree`,
but we should make this the same for "non" --tree as well.
This patch:
- changes `docker image ls` to hide both "untagged" and "dangling" images
by default.
- changes the behavior of `--all` on the client side to make them visible
The API response remains the same for now, but this is something we can
consider changing in future (possibly more granular than a single boolean).
Before this patch;
docker image ls --tree
i Info → U In Use
IMAGE ID DISK USAGE CONTENT SIZE EXTRA
docker:cli 28fb556c1ea1 276MB 69.8MB
├─ linux/amd64 828f4f57525d 0B 0B
├─ linux/arm/v6 563c0b58e54b 0B 0B
├─ linux/arm/v7 6045d4846c59 0B 0B
└─ linux/arm64/v8 11e8dfd68841 276MB 69.8MB
alpine:latest a8560b36e8b8 12.8MB 3.99MB U
├─ linux/amd64 1c4eef651f65 0B 0B
├─ linux/arm/v6 903bfe2ae994 0B 0B
├─ linux/arm/v7 9c2d245b3c01 0B 0B
├─ linux/arm64/v8 757d680068d7 12.8MB 3.99MB U
├─ linux/386 2436f2b3b7d2 0B 0B
├─ linux/ppc64le 9ed53fd3b831 0B 0B
├─ linux/riscv64 1de5eb4a9a67 0B 0B
└─ linux/s390x fe0dcdd1f783 0B 0B
<untagged> c6c1bcb0fd8d 12.8MB 3.99MB
└─ linux/arm64 cb171c618ae8 12.8MB 3.99MB
<untagged> 7361ef970703 12.8MB 3.99MB
└─ linux/arm64 07033f43e44a 12.8MB 3.99MB
<untagged> 0c62c63b81ec 12.8MB 3.99MB
└─ linux/arm64 94742272117f 12.8MB 3.99MB
<untagged> 91dd947eebd0 12.8MB 3.99MB
└─ linux/arm64 ee55d203e26f 12.8MB 3.99MB
<untagged> 382d9f57e8d8 12.8MB 3.99MB
└─ linux/arm64 5256d47804e3 12.8MB 3.99MB
<untagged> 56fa17d2a7e7 12.8MB 3.99MB
├─ linux/amd64 483f502c0e6a 0B 0B
├─ linux/arm/v6 c79529000bdf 0B 0B
├─ linux/arm/v7 cc455d4b2c47 0B 0B
├─ linux/arm64/v8 508c1b94e1d2 12.8MB 3.99MB
├─ linux/386 f32403957113 0B 0B
├─ linux/ppc64le 23dbce23b88f 0B 0B
├─ linux/riscv64 f9d2da150cee 0B 0B
└─ linux/s390x 6bb03952a007 0B 0B
After this patch
docker image ls --tree
i Info → U In Use
IMAGE ID DISK USAGE CONTENT SIZE EXTRA
docker:cli 28fb556c1ea1 276MB 69.8MB
├─ linux/amd64 828f4f57525d 0B 0B
├─ linux/arm/v6 563c0b58e54b 0B 0B
├─ linux/arm/v7 6045d4846c59 0B 0B
└─ linux/arm64/v8 11e8dfd68841 276MB 69.8MB
alpine:latest a8560b36e8b8 12.8MB 3.99MB U
├─ linux/amd64 1c4eef651f65 0B 0B
├─ linux/arm/v6 903bfe2ae994 0B 0B
├─ linux/arm/v7 9c2d245b3c01 0B 0B
├─ linux/arm64/v8 757d680068d7 12.8MB 3.99MB U
├─ linux/386 2436f2b3b7d2 0B 0B
├─ linux/ppc64le 9ed53fd3b831 0B 0B
├─ linux/riscv64 1de5eb4a9a67 0B 0B
└─ linux/s390x fe0dcdd1f783 0B 0B
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
178 lines
5.2 KiB
Go
178 lines
5.2 KiB
Go
package image
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/formatter"
|
|
flagsHelper "github.com/docker/cli/cli/flags"
|
|
"github.com/docker/cli/opts"
|
|
"github.com/docker/docker/api/types/image"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type imagesOptions struct {
|
|
matchName string
|
|
|
|
quiet bool
|
|
all bool
|
|
noTrunc bool
|
|
showDigests bool
|
|
format string
|
|
filter opts.FilterOpt
|
|
calledAs string
|
|
tree bool
|
|
}
|
|
|
|
// NewImagesCommand creates a new `docker images` command
|
|
func NewImagesCommand(dockerCLI command.Cli) *cobra.Command {
|
|
options := imagesOptions{filter: opts.NewFilterOpt()}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "images [OPTIONS] [REPOSITORY[:TAG]]",
|
|
Short: "List images",
|
|
Args: cli.RequiresMaxArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
if len(args) > 0 {
|
|
options.matchName = args[0]
|
|
}
|
|
// Pass through how the command was invoked. We use this to print
|
|
// warnings when an ambiguous argument was passed when using the
|
|
// legacy (top-level) "docker images" subcommand.
|
|
options.calledAs = cmd.CalledAs()
|
|
return runImages(cmd.Context(), dockerCLI, options)
|
|
},
|
|
Annotations: map[string]string{
|
|
"category-top": "7",
|
|
"aliases": "docker image ls, docker image list, docker images",
|
|
},
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
|
|
flags.BoolVarP(&options.quiet, "quiet", "q", false, "Only show image IDs")
|
|
flags.BoolVarP(&options.all, "all", "a", false, "Show all images (default hides intermediate images)")
|
|
flags.BoolVar(&options.noTrunc, "no-trunc", false, "Don't truncate output")
|
|
flags.BoolVar(&options.showDigests, "digests", false, "Show digests")
|
|
flags.StringVar(&options.format, "format", "", flagsHelper.FormatHelp)
|
|
flags.VarP(&options.filter, "filter", "f", "Filter output based on conditions provided")
|
|
|
|
flags.BoolVar(&options.tree, "tree", false, "List multi-platform images as a tree (EXPERIMENTAL)")
|
|
flags.SetAnnotation("tree", "version", []string{"1.47"})
|
|
flags.SetAnnotation("tree", "experimentalCLI", nil)
|
|
|
|
return cmd
|
|
}
|
|
|
|
func newListCommand(dockerCLI command.Cli) *cobra.Command {
|
|
cmd := *NewImagesCommand(dockerCLI)
|
|
cmd.Aliases = []string{"list"}
|
|
cmd.Use = "ls [OPTIONS] [REPOSITORY[:TAG]]"
|
|
return &cmd
|
|
}
|
|
|
|
func runImages(ctx context.Context, dockerCLI command.Cli, options imagesOptions) error {
|
|
filters := options.filter.Value()
|
|
if options.matchName != "" {
|
|
filters.Add("reference", options.matchName)
|
|
}
|
|
|
|
if options.tree {
|
|
if options.quiet {
|
|
return errors.New("--quiet is not yet supported with --tree")
|
|
}
|
|
if options.noTrunc {
|
|
return errors.New("--no-trunc is not yet supported with --tree")
|
|
}
|
|
if options.showDigests {
|
|
return errors.New("--show-digest is not yet supported with --tree")
|
|
}
|
|
if options.format != "" {
|
|
return errors.New("--format is not yet supported with --tree")
|
|
}
|
|
|
|
return runTree(ctx, dockerCLI, treeOptions{
|
|
all: options.all,
|
|
filters: filters,
|
|
})
|
|
}
|
|
|
|
images, err := dockerCLI.Client().ImageList(ctx, image.ListOptions{
|
|
All: options.all,
|
|
Filters: filters,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
format := options.format
|
|
if len(format) == 0 {
|
|
if len(dockerCLI.ConfigFile().ImagesFormat) > 0 && !options.quiet {
|
|
format = dockerCLI.ConfigFile().ImagesFormat
|
|
} else {
|
|
format = formatter.TableFormatKey
|
|
}
|
|
}
|
|
|
|
imageCtx := formatter.ImageContext{
|
|
Context: formatter.Context{
|
|
Output: dockerCLI.Out(),
|
|
Format: formatter.NewImageFormat(format, options.quiet, options.showDigests),
|
|
Trunc: !options.noTrunc,
|
|
},
|
|
Digest: options.showDigests,
|
|
}
|
|
if err := formatter.ImageWrite(imageCtx, images); err != nil {
|
|
return err
|
|
}
|
|
if options.matchName != "" && len(images) == 0 && options.calledAs == "images" {
|
|
printAmbiguousHint(dockerCLI.Err(), options.matchName)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// isDangling is a copy of [formatter.isDangling].
|
|
func isDangling(img image.Summary) bool {
|
|
if len(img.RepoTags) == 0 && len(img.RepoDigests) == 0 {
|
|
return true
|
|
}
|
|
return len(img.RepoTags) == 1 && img.RepoTags[0] == "<none>:<none>" && len(img.RepoDigests) == 1 && img.RepoDigests[0] == "<none>@<none>"
|
|
}
|
|
|
|
// printAmbiguousHint prints an informational warning if the provided filter
|
|
// argument is ambiguous.
|
|
//
|
|
// The "docker images" top-level subcommand predates the "docker <object> <verb>"
|
|
// convention (e.g. "docker image ls"), but accepts a positional argument to
|
|
// search/filter images by name (globbing). It's common for users to accidentally
|
|
// mistake these commands, and to use (e.g.) "docker images ls", expecting
|
|
// to see all images, but ending up with an empty list because no image named
|
|
// "ls" was found.
|
|
//
|
|
// Disallowing these search-terms would be a breaking change, but we can print
|
|
// and informational message to help the users correct their mistake.
|
|
func printAmbiguousHint(stdErr io.Writer, matchName string) {
|
|
switch matchName {
|
|
// List of subcommands for "docker image" and their aliases (see "docker image --help"):
|
|
case "build",
|
|
"history",
|
|
"import",
|
|
"inspect",
|
|
"list",
|
|
"load",
|
|
"ls",
|
|
"prune",
|
|
"pull",
|
|
"push",
|
|
"rm",
|
|
"save",
|
|
"tag":
|
|
|
|
_, _ = fmt.Fprintf(stdErr, "\nNo images found matching %q: did you mean \"docker image %[1]s\"?\n", matchName)
|
|
}
|
|
}
|