80b1285fec
Cobra allows for aliases to be defined for a command, but only allows these
to be defined at the same level (for example, `docker image ls` as alias for
`docker image list`). Our CLI has some commands that are available both as a
top-level shorthand as well as `docker <object> <verb>` subcommands. For example,
`docker ps` is a shorthand for `docker container ps` / `docker container ls`.
This patch introduces a custom "aliases" annotation that can be used to print
all available aliases for a command. While this requires these aliases to be
defined manually, in practice the list of aliases rarely changes, so maintenance
should be minimal.
As a convention, we could consider the first command in this list to be the
canonical command, so that we can use this information to add redirects in
our documentation in future.
Before this patch:
docker images --help
Usage: docker images [OPTIONS] [REPOSITORY[:TAG]]
List images
Options:
-a, --all Show all images (default hides intermediate images)
...
With this patch:
docker images --help
Usage: docker images [OPTIONS] [REPOSITORY[:TAG]]
List images
Aliases:
docker image ls, docker image list, docker images
Options:
-a, --all Show all images (default hides intermediate images)
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
102 lines
2.6 KiB
Go
102 lines
2.6 KiB
Go
package image
|
|
|
|
import (
|
|
"context"
|
|
|
|
"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"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type imagesOptions struct {
|
|
matchName string
|
|
|
|
quiet bool
|
|
all bool
|
|
noTrunc bool
|
|
showDigests bool
|
|
format string
|
|
filter opts.FilterOpt
|
|
}
|
|
|
|
// 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]
|
|
}
|
|
return runImages(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")
|
|
|
|
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(dockerCli command.Cli, options imagesOptions) error {
|
|
ctx := context.Background()
|
|
|
|
filters := options.filter.Value()
|
|
if options.matchName != "" {
|
|
filters.Add("reference", options.matchName)
|
|
}
|
|
|
|
listOptions := types.ImageListOptions{
|
|
All: options.all,
|
|
Filters: filters,
|
|
}
|
|
|
|
images, err := dockerCli.Client().ImageList(ctx, listOptions)
|
|
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,
|
|
}
|
|
return formatter.ImageWrite(imageCtx, images)
|
|
}
|