From 94b0d0ecd0cfbda8b61d474e9f68490384a1db94 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 31 Aug 2017 23:42:21 +0100 Subject: [PATCH] ctr: drop labels from `ctr containers` subcommand list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The labels can be very long (e.g. cri-containerd stores a large JSON metadata blob as `io.cri-containerd.container.metadata`) which renders the output useless due to all the line wrapping etc. The information is still available in `ctr containers info «name»`. Signed-off-by: Ian Campbell --- cmd/ctr/containers.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/cmd/ctr/containers.go b/cmd/ctr/containers.go index 06002a53b..c62924800 100644 --- a/cmd/ctr/containers.go +++ b/cmd/ctr/containers.go @@ -3,7 +3,6 @@ package main import ( "fmt" "os" - "strings" "text/tabwriter" "github.com/urfave/cli" @@ -48,26 +47,17 @@ var containersCommand = cli.Command{ return nil } w := tabwriter.NewWriter(os.Stdout, 4, 8, 4, ' ', 0) - fmt.Fprintln(w, "CONTAINER\tIMAGE\tRUNTIME\tLABELS\t") + fmt.Fprintln(w, "CONTAINER\tIMAGE\tRUNTIME\t") for _, c := range containers { - var labelStrings []string - for k, v := range c.Info().Labels { - labelStrings = append(labelStrings, strings.Join([]string{k, v}, "=")) - } - labels := strings.Join(labelStrings, ",") - if labels == "" { - labels = "-" - } imageName := c.Info().Image if imageName == "" { imageName = "-" } record := c.Info() - if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%v\t\n", + if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t\n", c.ID(), imageName, record.Runtime.Name, - labels, ); err != nil { return err }