cmd/dist: better organization and aliases for image command

Signed-off-by: Stephen J Day <stephen.day@docker.com>

cmd/dist/images.go

@@ -12,9 +12,19 @@ import (
 	"github.com/urfave/cli"
 )
 
+var imageCommand = cli.Command{
+	Name:    "images",
+	Aliases: []string{"images"},
+	Usage:   "image management",
+	Subcommands: cli.Commands{
+		imagesListCommand,
+		imageRemoveCommand,
+	},
+}
+
 var imagesListCommand = cli.Command{
 	Name:        "list",
-	Aliases:     []string{"images"},
+	Aliases:     []string{"ls"},
 	Usage:       "list images known to containerd",
 	ArgsUsage:   "[flags] <ref>",
 	Description: `List images registered with containerd.`,
@@ -54,11 +64,12 @@ var imagesListCommand = cli.Command{
 	},
 }
 
-var rmiCommand = cli.Command{
+var imageRemoveCommand = cli.Command{
-	Name:        "rmi",
+	Name:        "remove",
-	Usage:       "Delete one or more images by reference.",
+	Aliases:     []string{"rm"},
+	Usage:       "Remove one or more images by reference.",
 	ArgsUsage:   "[flags] <ref> [<ref>, ...]",
-	Description: `Delete one or more images by reference.`,
+	Description: `Remove one or more images by reference.`,
 	Flags:       []cli.Flag{},
 	Action: func(clicontext *cli.Context) error {
 		var (

cmd/dist/main.go

@@ -93,15 +93,6 @@ distribution tool
 	}
 }
 
-var imageCommand = cli.Command{
-	Name:  "image",
-	Usage: "image management",
-	Subcommands: cli.Commands{
-		imagesListCommand,
-		rmiCommand,
-	},
-}
-
 var contentCommand = cli.Command{
 	Name:  "content",
 	Usage: "content management",