cmd/{ctr,dist}: move images command to ctr

Rather than make a large PR, we can move parts of the dist commands over
piece by piece. This first step moves over the images command. Others
will follow.

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

cmd/ctr/images.go

@@ -0,0 +1,174 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"sort"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/containerd/containerd/errdefs"
+	"github.com/containerd/containerd/images"
+	"github.com/containerd/containerd/log"
+	"github.com/containerd/containerd/progress"
+	"github.com/pkg/errors"
+	"github.com/urfave/cli"
+)
+
+var imageCommand = cli.Command{
+	Name:  "images",
+	Usage: "image management",
+	Subcommands: cli.Commands{
+		imagesListCommand,
+		imageRemoveCommand,
+		imagesSetLabelsCommand,
+	},
+}
+
+var imagesListCommand = cli.Command{
+	Name:        "list",
+	Aliases:     []string{"ls"},
+	Usage:       "list images known to containerd",
+	ArgsUsage:   "[flags] <ref>",
+	Description: `List images registered with containerd.`,
+	Flags:       []cli.Flag{},
+	Action: func(clicontext *cli.Context) error {
+		var (
+			filters     = clicontext.Args()
+			ctx, cancel = appContext(clicontext)
+		)
+		defer cancel()
+
+		client, err := newClient(clicontext)
+		if err != nil {
+			return err
+		}
+
+		imageStore := client.ImageService()
+		cs := client.ContentStore()
+
+		images, err := imageStore.List(ctx, filters...)
+		if err != nil {
+			return errors.Wrap(err, "failed to list images")
+		}
+
+		tw := tabwriter.NewWriter(os.Stdout, 1, 8, 1, ' ', 0)
+		fmt.Fprintln(tw, "REF\tTYPE\tDIGEST\tSIZE\tLABELS\t")
+		for _, image := range images {
+			size, err := image.Size(ctx, cs)
+			if err != nil {
+				log.G(ctx).WithError(err).Errorf("failed calculating size for image %s", image.Name)
+			}
+
+			labels := "-"
+			if len(image.Labels) > 0 {
+				var pairs []string
+				for k, v := range image.Labels {
+					pairs = append(pairs, fmt.Sprintf("%v=%v", k, v))
+				}
+				sort.Strings(pairs)
+				labels = strings.Join(pairs, ",")
+			}
+
+			fmt.Fprintf(tw, "%v\t%v\t%v\t%v\t%s\t\n",
+				image.Name,
+				image.Target.MediaType,
+				image.Target.Digest,
+				progress.Bytes(size),
+				labels)
+		}
+
+		return tw.Flush()
+	},
+}
+
+var imagesSetLabelsCommand = cli.Command{
+	Name:        "label",
+	Usage:       "Set and clear labels for an image.",
+	ArgsUsage:   "[flags] <name> [<key>=<value>, ...]",
+	Description: "Set and clear labels for an image.",
+	Flags:       []cli.Flag{},
+	Action: func(clicontext *cli.Context) error {
+		var (
+			ctx, cancel  = appContext(clicontext)
+			name, labels = objectWithLabelArgs(clicontext)
+		)
+		defer cancel()
+
+		client, err := newClient(clicontext)
+		if err != nil {
+			return err
+		}
+
+		if name == "" {
+			return errors.New("please specify an image")
+		}
+
+		var (
+			is         = client.ImageService()
+			fieldpaths []string
+		)
+
+		for k := range labels {
+			fieldpaths = append(fieldpaths, strings.Join([]string{"labels", k}, "."))
+		}
+
+		image := images.Image{
+			Name:   name,
+			Labels: labels,
+		}
+
+		updated, err := is.Update(ctx, image, fieldpaths...)
+		if err != nil {
+			return err
+		}
+
+		var labelStrings []string
+		for k, v := range updated.Labels {
+			labelStrings = append(labelStrings, fmt.Sprintf("%s=%s", k, v))
+		}
+
+		fmt.Println(strings.Join(labelStrings, ","))
+
+		return nil
+	},
+}
+
+var imageRemoveCommand = cli.Command{
+	Name:        "remove",
+	Aliases:     []string{"rm"},
+	Usage:       "Remove one or more images by reference.",
+	ArgsUsage:   "[flags] <ref> [<ref>, ...]",
+	Description: `Remove one or more images by reference.`,
+	Flags:       []cli.Flag{},
+	Action: func(clicontext *cli.Context) error {
+		var (
+			exitErr error
+		)
+		ctx, cancel := appContext(clicontext)
+		defer cancel()
+
+		client, err := newClient(clicontext)
+		if err != nil {
+			return err
+		}
+
+		imageStore := client.ImageService()
+
+		for _, target := range clicontext.Args() {
+			if err := imageStore.Delete(ctx, target); err != nil {
+				if !errdefs.IsNotFound(err) {
+					if exitErr == nil {
+						exitErr = errors.Wrapf(err, "unable to delete %v", target)
+					}
+					log.G(ctx).WithError(err).Errorf("unable to delete %v", target)
+					continue
+				}
+			}
+
+			fmt.Println(target)
+		}
+
+		return exitErr
+	},
+}

cmd/ctr/main.go

@@ -46,6 +46,10 @@ containerd CLI
 			Name:  "timeout",
 			Usage: "total timeout for ctr commands",
 		},
+		cli.DurationFlag{
+			Name:  "connect-timeout",
+			Usage: "timeout for connecting to containerd",
+		},
 		cli.StringFlag{
 			Name:   "namespace, n",
 			Usage:  "namespace to use with commands",
@@ -54,13 +58,14 @@ containerd CLI
 		},
 	}
 	app.Commands = append([]cli.Command{
-		attachCommand,
+		imageCommand,
+		containersCommand,
 		checkpointCommand,
 		runCommand,
+		attachCommand,
 		deleteCommand,
 		namespacesCommand,
 		eventsCommand,
-		containersCommand,
 		taskListCommand,
 		infoCommand,
 		killCommand,