Browse Source

Merge pull request #28735 from yongtang/28708-plugin-list-id

Add `ID` field for `docker plugin ls`
Sebastiaan van Stijn 8 years ago
parent
commit
51c5718aa3
2 changed files with 7 additions and 4 deletions
  1. 5 2
      cli/command/plugin/list.go
  2. 2 2
      docs/reference/commandline/plugin_ls.md

+ 5 - 2
cli/command/plugin/list.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/stringutils"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
@@ -43,17 +44,19 @@ func runList(dockerCli *command.DockerCli, opts listOptions) error {
 	}
 
 	w := tabwriter.NewWriter(dockerCli.Out(), 20, 1, 3, ' ', 0)
-	fmt.Fprintf(w, "NAME \tTAG \tDESCRIPTION\tENABLED")
+	fmt.Fprintf(w, "ID \tNAME \tTAG \tDESCRIPTION\tENABLED")
 	fmt.Fprintf(w, "\n")
 
 	for _, p := range plugins {
+		id := p.ID
 		desc := strings.Replace(p.Config.Description, "\n", " ", -1)
 		desc = strings.Replace(desc, "\r", " ", -1)
 		if !opts.noTrunc {
+			id = stringid.TruncateID(p.ID)
 			desc = stringutils.Ellipsis(desc, 45)
 		}
 
-		fmt.Fprintf(w, "%s\t%s\t%s\t%v\n", p.Name, p.Tag, desc, p.Enabled)
+		fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%v\n", id, p.Name, p.Tag, desc, p.Enabled)
 	}
 	w.Flush()
 	return nil

+ 2 - 2
docs/reference/commandline/plugin_ls.md

@@ -36,8 +36,8 @@ Example output:
 ```bash
 $ docker plugin ls
 
-NAME                  TAG                 DESCRIPTION                ENABLED
-tiborvass/no-remove   latest              A test plugin for Docker   true
+ID                  NAME                  TAG                 DESCRIPTION                ENABLED
+69553ca1d123        tiborvass/no-remove   latest              A test plugin for Docker   true
 ```
 
 ## Related information