From f649b0a0574b3d7ce1a15d6177a35ed5b9000888 Mon Sep 17 00:00:00 2001 From: Ken Cochrane Date: Fri, 12 Jul 2013 13:55:26 -0400 Subject: [PATCH 1/3] updated the help commands on a few commands that were not correct Upstream-commit: 4174e7aa7a6600a2cfedd1c568000556cf1daf79 Component: engine --- components/engine/commands.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/commands.go b/components/engine/commands.go index b3b1a57199..20195e2e39 100644 --- a/components/engine/commands.go +++ b/components/engine/commands.go @@ -469,7 +469,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error { func (cli *DockerCli) CmdStop(args ...string) error { cmd := Subcmd("stop", "[OPTIONS] CONTAINER [CONTAINER...]", "Stop a running container") - nSeconds := cmd.Int("t", 10, "wait t seconds before killing the container") + nSeconds := cmd.Int("t", 10, "wait t seconds before stopping the container") if err := cmd.Parse(args); err != nil { return nil } @@ -494,7 +494,7 @@ func (cli *DockerCli) CmdStop(args ...string) error { func (cli *DockerCli) CmdRestart(args ...string) error { cmd := Subcmd("restart", "[OPTIONS] CONTAINER [CONTAINER...]", "Restart a running container") - nSeconds := cmd.Int("t", 10, "wait t seconds before killing the container") + nSeconds := cmd.Int("t", 10, "wait t seconds before restarting the container") if err := cmd.Parse(args); err != nil { return nil } @@ -773,7 +773,7 @@ func (cli *DockerCli) CmdImport(args ...string) error { } func (cli *DockerCli) CmdPush(args ...string) error { - cmd := Subcmd("push", "[OPTION] NAME", "Push an image or a repository to the registry") + cmd := Subcmd("push", "NAME", "Push an image or a repository to the registry") if err := cmd.Parse(args); err != nil { return nil } From aa8559ee188aaba02cdb1e0227027180d4d0fe12 Mon Sep 17 00:00:00 2001 From: Ken Cochrane Date: Fri, 12 Jul 2013 14:05:26 -0400 Subject: [PATCH 2/3] updated the rmi command docs, the had typos Upstream-commit: 364f48d6c7386874ee3fa0696b7a466f76fcf698 Component: engine --- components/engine/docs/sources/commandline/command/rmi.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/docs/sources/commandline/command/rmi.rst b/components/engine/docs/sources/commandline/command/rmi.rst index a0131886d6..954e5222c6 100644 --- a/components/engine/docs/sources/commandline/command/rmi.rst +++ b/components/engine/docs/sources/commandline/command/rmi.rst @@ -8,6 +8,6 @@ :: - Usage: docker rmimage [OPTIONS] IMAGE + Usage: docker rmi IMAGE [IMAGE...] - Remove an image + Remove one or more images From 28398dc429db15dca9ae0d3ebdf147a389a6fca8 Mon Sep 17 00:00:00 2001 From: Ken Cochrane Date: Wed, 17 Jul 2013 13:46:11 -0400 Subject: [PATCH 3/3] updated with notes from @vieux Upstream-commit: d0e8ca1257f7f969a035d3d78b55e08c067e8a20 Component: engine --- components/engine/commands.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/engine/commands.go b/components/engine/commands.go index 20195e2e39..3223c962ac 100644 --- a/components/engine/commands.go +++ b/components/engine/commands.go @@ -94,8 +94,8 @@ func (cli *DockerCli) CmdHelp(args ...string) error { {"pull", "Pull an image or a repository from the docker registry server"}, {"push", "Push an image or a repository to the docker registry server"}, {"restart", "Restart a running container"}, - {"rm", "Remove a container"}, - {"rmi", "Remove an image"}, + {"rm", "Remove one or more containers"}, + {"rmi", "Remove one or more images"}, {"run", "Run a command in a new container"}, {"search", "Search for an image in the docker index"}, {"start", "Start a stopped container"}, @@ -469,7 +469,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error { func (cli *DockerCli) CmdStop(args ...string) error { cmd := Subcmd("stop", "[OPTIONS] CONTAINER [CONTAINER...]", "Stop a running container") - nSeconds := cmd.Int("t", 10, "wait t seconds before stopping the container") + nSeconds := cmd.Int("t", 10, "Number of seconds to try to stop for before killing the container. Default=10") if err := cmd.Parse(args); err != nil { return nil } @@ -494,7 +494,7 @@ func (cli *DockerCli) CmdStop(args ...string) error { func (cli *DockerCli) CmdRestart(args ...string) error { cmd := Subcmd("restart", "[OPTIONS] CONTAINER [CONTAINER...]", "Restart a running container") - nSeconds := cmd.Int("t", 10, "wait t seconds before restarting the container") + nSeconds := cmd.Int("t", 10, "Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default=10") if err := cmd.Parse(args); err != nil { return nil } @@ -638,7 +638,7 @@ func (cli *DockerCli) CmdPort(args ...string) error { // 'docker rmi IMAGE' removes all images with the name IMAGE func (cli *DockerCli) CmdRmi(args ...string) error { - cmd := Subcmd("rmi", "IMAGE [IMAGE...]", "Remove an image") + cmd := Subcmd("rmi", "IMAGE [IMAGE...]", "Remove one or more images") if err := cmd.Parse(args); err != nil { return nil } @@ -703,7 +703,7 @@ func (cli *DockerCli) CmdHistory(args ...string) error { } func (cli *DockerCli) CmdRm(args ...string) error { - cmd := Subcmd("rm", "[OPTIONS] CONTAINER [CONTAINER...]", "Remove a container") + cmd := Subcmd("rm", "[OPTIONS] CONTAINER [CONTAINER...]", "Remove one or more containers") v := cmd.Bool("v", false, "Remove the volumes associated to the container") if err := cmd.Parse(args); err != nil { return nil