kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #143 from dotcloud/141-142_update_help-fix

Browse source 
141 142 update help fix
This commit is contained in:
Ken Cochrane 2013-03-24 07:07:24 -07:00
commit 906626b8f8
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
commands.go
View file

@ -30,14 +30,13 @@ func (srv *Server) Name() string {
func (srv *Server) Help() string { func (srv *Server) Help() string {
help := "Usage: docker COMMAND [arg...]\n\nA self-sufficient runtime for linux containers.\n\nCommands:\n" help := "Usage: docker COMMAND [arg...]\n\nA self-sufficient runtime for linux containers.\n\nCommands:\n"
for _, cmd := range [][]interface{}{ for _, cmd := range [][]interface{}{
{"run", "Run a command in a container"},
{"ps", "Display a list of containers"},
{"import", "Create a new filesystem image from the contents of a tarball"},
{"attach", "Attach to a running container"}, {"attach", "Attach to a running container"},
{"commit", "Create a new image from a container's changes"}, {"commit", "Create a new image from a container's changes"},
{"history", "Show the history of an image"},
{"diff", "Inspect changes on a container's filesystem"}, {"diff", "Inspect changes on a container's filesystem"},
{"export", "Stream the contents of a container as a tar archive"},
{"history", "Show the history of an image"},
{"images", "List images"}, {"images", "List images"},
{"import", "Create a new filesystem image from the contents of a tarball"},
{"info", "Display system-wide information"}, {"info", "Display system-wide information"},
{"inspect", "Return low-level information on a container"}, {"inspect", "Return low-level information on a container"},
{"kill", "Kill a running container"}, {"kill", "Kill a running container"},
@ -53,7 +52,7 @@ func (srv *Server) Help() string {
{"run", "Run a command in a new container"}, {"run", "Run a command in a new container"},
{"start", "Start a stopped container"}, {"start", "Start a stopped container"},
{"stop", "Stop a running container"}, {"stop", "Stop a running container"},
{"export", "Stream the contents of a container as a tar archive"}, {"tag", "Tag an image into a repository"},
{"version", "Show the docker version information"}, {"version", "Show the docker version information"},
{"wait", "Block until a container stops, then print its exit code"}, {"wait", "Block until a container stops, then print its exit code"},
} { } {
@ -402,7 +401,7 @@ func (srv *Server) CmdImport(stdin io.ReadCloser, stdout io.Writer, args ...stri
} }
func (srv *Server) CmdPush(stdin io.ReadCloser, stdout io.Writer, args ...string) error { func (srv *Server) CmdPush(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
cmd := rcli.Subcmd(stdout, "push", "LOCAL", "Push an image or a repository to the registry") cmd := rcli.Subcmd(stdout, "push", "NAME", "Push an image or a repository to the registry")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }
@ -462,7 +461,7 @@ func (srv *Server) CmdPush(stdin io.ReadCloser, stdout io.Writer, args ...string
} }
func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string) error { func (srv *Server) CmdPull(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
cmd := rcli.Subcmd(stdout, "pull", "IMAGE", "Pull an image or a repository from the registry") cmd := rcli.Subcmd(stdout, "pull", "NAME", "Pull an image or a repository from the registry")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }