Merge pull request containerd#1734 from vieux/update_images_ls_platforms

crosbymichael · web-flow · commit e5912e1c89c8 · 2017-11-08T13:53:16.000-05:00
Add S to PLATFORM in images list &amp; plugins list
diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go
@@ -70,7 +70,7 @@ var listCommand = cli.Command{
 			return nil
 		}
 		tw := tabwriter.NewWriter(os.Stdout, 1, 8, 1, ' ', 0)
-		fmt.Fprintln(tw, "REF\tTYPE\tDIGEST\tSIZE\tPLATFORM\tLABELS\t")
+		fmt.Fprintln(tw, "REF\tTYPE\tDIGEST\tSIZE\tPLATFORMS\tLABELS\t")
 		for _, image := range imageList {
 			size, err := image.Size(ctx, cs, platforms.Default())
 			if err != nil {
diff --git a/cmd/ctr/commands/plugins/plugins.go b/cmd/ctr/commands/plugins/plugins.go
@@ -93,7 +93,7 @@ var Command = cli.Command{
 			return w.Flush()
 		}
 
-		fmt.Fprintln(w, "TYPE\tID\tPLATFORM\tSTATUS\t")
+		fmt.Fprintln(w, "TYPE\tID\tPLATFORMS\tSTATUS\t")
 		for _, plugin := range response.Plugins {
 			status := "ok"
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ var listCommand = cli.Command{`
`70`	`70`	`return nil`
`71`	`71`	`}`
`72`	`72`	`tw := tabwriter.NewWriter(os.Stdout, 1, 8, 1, ' ', 0)`
`73`		`- fmt.Fprintln(tw, "REF\tTYPE\tDIGEST\tSIZE\tPLATFORM\tLABELS\t")`
	`73`	`+ fmt.Fprintln(tw, "REF\tTYPE\tDIGEST\tSIZE\tPLATFORMS\tLABELS\t")`
`74`	`74`	`for _, image := range imageList {`
`75`	`75`	`size, err := image.Size(ctx, cs, platforms.Default())`
`76`	`76`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ var Command = cli.Command{`
`93`	`93`	`return w.Flush()`
`94`	`94`	`}`
`95`	`95`
`96`		`- fmt.Fprintln(w, "TYPE\tID\tPLATFORM\tSTATUS\t")`
	`96`	`+ fmt.Fprintln(w, "TYPE\tID\tPLATFORMS\tSTATUS\t")`
`97`	`97`	`for _, plugin := range response.Plugins {`
`98`	`98`	`status := "ok"`
`99`	`99`