Fix docker exec help messages.
| ... | ... |
@@ -2470,7 +2470,7 @@ func (cli *DockerCli) CmdLoad(args ...string) error {
|
| 2470 | 2470 |
} |
| 2471 | 2471 |
|
| 2472 | 2472 |
func (cli *DockerCli) CmdExec(args ...string) error {
|
| 2473 |
- cmd := cli.Subcmd("exec", "CONTAINER COMMAND [ARG...]", "Run a command in an existing container")
|
|
| 2473 |
+ cmd := cli.Subcmd("exec", "CONTAINER COMMAND [ARG...]", "Run a command in a running container")
|
|
| 2474 | 2474 |
|
| 2475 | 2475 |
execConfig, err := runconfig.ParseExec(cmd, args) |
| 2476 | 2476 |
if err != nil {
|
| ... | ... |
@@ -42,7 +42,7 @@ type TtyTerminal interface {
|
| 42 | 42 |
|
| 43 | 43 |
type Driver interface {
|
| 44 | 44 |
Run(c *Command, pipes *Pipes, startCallback StartCallback) (int, error) // Run executes the process and blocks until the process exits and returns the exit code |
| 45 |
- // Exec executes the process in an existing container, blocks until the process exits and returns the exit code |
|
| 45 |
+ // Exec executes the process in a running container, blocks until the process exits and returns the exit code |
|
| 46 | 46 |
Exec(c *Command, processConfig *ProcessConfig, pipes *Pipes, startCallback StartCallback) (int, error) |
| 47 | 47 |
Kill(c *Command, sig int) error |
| 48 | 48 |
Pause(c *Command) error |
| ... | ... |
@@ -62,7 +62,7 @@ func init() {
|
| 62 | 62 |
{"create", "Create a new container"},
|
| 63 | 63 |
{"diff", "Inspect changes on a container's filesystem"},
|
| 64 | 64 |
{"events", "Get real time events from the server"},
|
| 65 |
- {"exec", "Run a command in an existing container"},
|
|
| 65 |
+ {"exec", "Run a command in a running container"},
|
|
| 66 | 66 |
{"export", "Stream the contents of a container as a tar archive"},
|
| 67 | 67 |
{"history", "Show the history of an image"},
|
| 68 | 68 |
{"images", "List images"},
|
| ... | ... |
@@ -637,7 +637,7 @@ You'll need two shells for this example. |
| 637 | 637 |
|
| 638 | 638 |
Usage: docker exec [OPTIONS] CONTAINER COMMAND [ARG...] |
| 639 | 639 |
|
| 640 |
- Run a command in an existing container |
|
| 640 |
+ Run a command in a running container |
|
| 641 | 641 |
|
| 642 | 642 |
-d, --detach=false Detached mode: run command in the background |
| 643 | 643 |
-i, --interactive=false Keep STDIN open even if not attached |