Merge pull request #16674 from coolljt0725/use_consistent_command_description

Use consistent command description
Upstream-commit: b5d914188efa55e6cf1fcd14334b2c1b61181eea
Component: engine

components/engine/docker/docker.go

@@ -36,7 +36,7 @@ func main() {
 		help := "\nCommands:\n"
 
 		for _, cmd := range dockerCommands {
-			help += fmt.Sprintf("    %-10.10s%s\n", cmd.name, cmd.description)
+			help += fmt.Sprintf("    %-10.10s%s\n", cmd.Name, cmd.Description)
 		}
 
 		help += "\nRun 'docker COMMAND --help' for more information on a command."

components/engine/docker/flags.go

@@ -1,64 +1,30 @@
 package main
 
-import flag "github.com/docker/docker/pkg/mflag"
+import (
+	"sort"
+
+	"github.com/docker/docker/cli"
+	flag "github.com/docker/docker/pkg/mflag"
+)
 
 var (
 	flHelp    = flag.Bool([]string{"h", "-help"}, false, "Print usage")
 	flVersion = flag.Bool([]string{"v", "-version"}, false, "Print version information and quit")
 )
 
-type command struct {
-	name        string
-	description string
-}
-
-type byName []command
+type byName []cli.Command
 
 func (a byName) Len() int           { return len(a) }
 func (a byName) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a byName) Less(i, j int) bool { return a[i].name < a[j].name }
+func (a byName) Less(i, j int) bool { return a[i].Name < a[j].Name }
+
+var dockerCommands []cli.Command
 
 // TODO(tiborvass): do not show 'daemon' on client-only binaries
-// and deduplicate description in dockerCommands and cli subcommands
-var dockerCommands = []command{
-	{"attach", "Attach to a running container"},
-	{"build", "Build an image from a Dockerfile"},
-	{"commit", "Create a new image from a container's changes"},
-	{"cp", "Copy files/folders between a container and the local filesystem"},
-	{"create", "Create a new container"},
-	{"diff", "Inspect changes on a container's filesystem"},
-	{"events", "Get real time events from the server"},
-	{"exec", "Run a command in a running container"},
-	{"export", "Export a container's filesystem as a tar archive"},
-	{"history", "Show the history of an image"},
-	{"images", "List images"},
-	{"import", "Import the contents from a tarball to create a filesystem image"},
-	{"info", "Display system-wide information"},
-	{"inspect", "Return low-level information on a container or image"},
-	{"kill", "Kill a running container"},
-	{"load", "Load an image from a tar archive or STDIN"},
-	{"login", "Register or log in to a Docker registry"},
-	{"logout", "Log out from a Docker registry"},
-	{"logs", "Fetch the logs of a container"},
-	{"pause", "Pause all processes within a container"},
-	{"port", "List port mappings or a specific mapping for the CONTAINER"},
-	{"ps", "List containers"},
-	{"pull", "Pull an image or a repository from a registry"},
-	{"push", "Push an image or a repository to a registry"},
-	{"rename", "Rename a container"},
-	{"restart", "Restart a container"},
-	{"rm", "Remove one or more containers"},
-	{"rmi", "Remove one or more images"},
-	{"run", "Run a command in a new container"},
-	{"save", "Save an image(s) to a tar archive"},
-	{"search", "Search the Docker Hub for images"},
-	{"start", "Start one or more containers"},
-	{"stats", "Display a live stream of container(s) resource usage statistics"},
-	{"stop", "Stop a container"},
-	{"tag", "Tag an image into a repository"},
-	{"top", "Display the running processes of a container"},
-	{"unpause", "Unpause all processes within a container"},
-	{"version", "Show the Docker version information"},
-	{"volume", "Manage Docker volumes"},
-	{"wait", "Block until a container stops, then print its exit code"},
+
+func init() {
+	for _, cmd := range cli.DockerCommands {
+		dockerCommands = append(dockerCommands, cmd)
+	}
+	sort.Sort(byName(dockerCommands))
 }

components/engine/docker/flags_experimental.go

@@ -2,10 +2,14 @@
 
 package main
 
-import "sort"
+import (
+	"sort"
+
+	"github.com/docker/docker/cli"
+)
 
 func init() {
-	dockerCommands = append(dockerCommands, command{"network", "Network management"})
+	dockerCommands = append(dockerCommands, cli.Command{Name: "network", Description: "Network management"})
 
 	//Sorting logic required here to pass Command Sort Test.
 	sort.Sort(byName(dockerCommands))