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>
90 lines
2.0 KiB
Go
90 lines
2.0 KiB
Go
package image
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/docker/api/types"
|
|
apiclient "github.com/docker/docker/client"
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type removeOptions struct {
|
|
force bool
|
|
noPrune bool
|
|
}
|
|
|
|
// NewRemoveCommand creates a new `docker remove` command
|
|
func NewRemoveCommand(dockerCli command.Cli) *cobra.Command {
|
|
var opts removeOptions
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "rmi [OPTIONS] IMAGE [IMAGE...]",
|
|
Short: "Remove one or more images",
|
|
Args: cli.RequiresMinArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
return runRemove(dockerCli, opts, args)
|
|
},
|
|
Annotations: map[string]string{
|
|
"aliases": "docker image rm, docker image remove, docker rmi",
|
|
},
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
|
|
flags.BoolVarP(&opts.force, "force", "f", false, "Force removal of the image")
|
|
flags.BoolVar(&opts.noPrune, "no-prune", false, "Do not delete untagged parents")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func newRemoveCommand(dockerCli command.Cli) *cobra.Command {
|
|
cmd := *NewRemoveCommand(dockerCli)
|
|
cmd.Aliases = []string{"rmi", "remove"}
|
|
cmd.Use = "rm [OPTIONS] IMAGE [IMAGE...]"
|
|
return &cmd
|
|
}
|
|
|
|
func runRemove(dockerCli command.Cli, opts removeOptions, images []string) error {
|
|
client := dockerCli.Client()
|
|
ctx := context.Background()
|
|
|
|
options := types.ImageRemoveOptions{
|
|
Force: opts.force,
|
|
PruneChildren: !opts.noPrune,
|
|
}
|
|
|
|
var errs []string
|
|
var fatalErr = false
|
|
for _, img := range images {
|
|
dels, err := client.ImageRemove(ctx, img, options)
|
|
if err != nil {
|
|
if !apiclient.IsErrNotFound(err) {
|
|
fatalErr = true
|
|
}
|
|
errs = append(errs, err.Error())
|
|
} else {
|
|
for _, del := range dels {
|
|
if del.Deleted != "" {
|
|
fmt.Fprintf(dockerCli.Out(), "Deleted: %s\n", del.Deleted)
|
|
} else {
|
|
fmt.Fprintf(dockerCli.Out(), "Untagged: %s\n", del.Untagged)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if len(errs) > 0 {
|
|
msg := strings.Join(errs, "\n")
|
|
if !opts.force || fatalErr {
|
|
return errors.New(msg)
|
|
}
|
|
fmt.Fprintln(dockerCli.Err(), msg)
|
|
}
|
|
return nil
|
|
}
|