docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CmdInspect and CmdImages help/parsing. Fixes #38

This commit is contained in:
Charles Hooper 2013-03-11 22:08:22 +00:00
parent fb350e0c77
commit 06d420d2ea
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/server.go
View File

@ -60,6 +60,7 @@ func (srv *Server) Help() string {
{"tar", "Stream the contents of a container as a tar archive"}, {"tar", "Stream the contents of a container as a tar archive"},
{"web", "Generate a web UI"}, {"web", "Generate a web UI"},
{"images", "List images"}, {"images", "List images"},
{"inspect", "Return low-level information on a container"},
} { } {
help += fmt.Sprintf(" %-10.10s%s\n", cmd...) help += fmt.Sprintf(" %-10.10s%s\n", cmd...)
} }
@ -282,7 +283,6 @@ func (srv *Server) CmdLs(stdin io.ReadCloser, stdout io.Writer, args ...string)
func (srv *Server) CmdInspect(stdin io.ReadCloser, stdout io.Writer, args ...string) error { func (srv *Server) CmdInspect(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
cmd := rcli.Subcmd(stdout, "inspect", "[OPTIONS] CONTAINER", "Return low-level information on a container") cmd := rcli.Subcmd(stdout, "inspect", "[OPTIONS] CONTAINER", "Return low-level information on a container")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
cmd.Usage()
return nil return nil
} }
if cmd.NArg() < 1 { if cmd.NArg() < 1 {
@ -463,7 +463,9 @@ func (srv *Server) CmdImages(stdin io.ReadCloser, stdout io.Writer, args ...stri
cmd := rcli.Subcmd(stdout, "images", "[OPTIONS] [NAME]", "List images") cmd := rcli.Subcmd(stdout, "images", "[OPTIONS] [NAME]", "List images")
limit := cmd.Int("l", 0, "Only show the N most recent versions of each image") limit := cmd.Int("l", 0, "Only show the N most recent versions of each image")
quiet := cmd.Bool("q", false, "only show numeric IDs") quiet := cmd.Bool("q", false, "only show numeric IDs")
cmd.Parse(args) if err := cmd.Parse(args); err != nil {
return nil
}
if cmd.NArg() > 1 { if cmd.NArg() > 1 {
cmd.Usage() cmd.Usage()
return nil return nil
@ -893,7 +895,7 @@ func New() (*Server, error) {
return nil, err return nil, err
} }
srv := &Server{ srv := &Server{
images: images, images: images,
containers: containers, containers: containers,
} }
return srv, nil return srv, nil