github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1456 from ijc/ctr-list-no-labels

Browse Source 
ctr: drop labels from `ctr containers` subcommand list
This commit is contained in:
Michael Crosby 2017-09-07 11:07:06 -04:00 committed by GitHub
commit 2cfd7df257
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/ctr/containers.go
View File

@ -3,7 +3,6 @@ package main
import ( import (
"fmt" "fmt"
"os" "os"
"strings"
"text/tabwriter" "text/tabwriter"
"github.com/urfave/cli" "github.com/urfave/cli"
@ -48,26 +47,17 @@ var containersCommand = cli.Command{
return nil return nil
} }
w := tabwriter.NewWriter(os.Stdout, 4, 8, 4, ' ', 0) 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 { 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 imageName := c.Info().Image
if imageName == "" { if imageName == "" {
imageName = "-" imageName = "-"
} }
record := c.Info() 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(), c.ID(),
imageName, imageName,
record.Runtime.Name, record.Runtime.Name,
labels,
); err != nil { ); err != nil {
return err return err
} }