IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
| ... | ... |
@@ -491,7 +491,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
|
| 491 | 491 |
} |
| 492 | 492 |
|
| 493 | 493 |
func (cli *DockerCli) CmdStop(args ...string) error {
|
| 494 |
- cmd := Subcmd("stop", "[OPTIONS] CONTAINER [CONTAINER...]", "Stop a running container")
|
|
| 494 |
+ cmd := Subcmd("stop", "[OPTIONS] CONTAINER [CONTAINER...]", "Stop a running container (Send SIGTERM, and then SIGKILL after grace period)")
|
|
| 495 | 495 |
nSeconds := cmd.Int("t", 10, "Number of seconds to wait for the container to stop before killing it.")
|
| 496 | 496 |
if err := cmd.Parse(args); err != nil {
|
| 497 | 497 |
return nil |
| ... | ... |
@@ -876,7 +876,7 @@ func (cli *DockerCli) CmdRm(args ...string) error {
|
| 876 | 876 |
|
| 877 | 877 |
// 'docker kill NAME' kills a running container |
| 878 | 878 |
func (cli *DockerCli) CmdKill(args ...string) error {
|
| 879 |
- cmd := Subcmd("kill", "CONTAINER [CONTAINER...]", "Kill a running container")
|
|
| 879 |
+ cmd := Subcmd("kill", "CONTAINER [CONTAINER...]", "Kill a running container (send SIGKILL)")
|
|
| 880 | 880 |
if err := cmd.Parse(args); err != nil {
|
| 881 | 881 |
return nil |
| 882 | 882 |
} |
| ... | ... |
@@ -404,7 +404,9 @@ Insert file from github |
| 404 | 404 |
|
| 405 | 405 |
Usage: docker kill CONTAINER [CONTAINER...] |
| 406 | 406 |
|
| 407 |
- Kill a running container |
|
| 407 |
+ Kill a running container (Send SIGKILL) |
|
| 408 |
+ |
|
| 409 |
+The main process inside the container will be sent SIGKILL. |
|
| 408 | 410 |
|
| 409 | 411 |
.. _cli_login: |
| 410 | 412 |
|
| ... | ... |
@@ -707,9 +709,11 @@ to the newly created container. |
| 707 | 707 |
|
| 708 | 708 |
Usage: docker stop [OPTIONS] CONTAINER [CONTAINER...] |
| 709 | 709 |
|
| 710 |
- Stop a running container |
|
| 710 |
+ Stop a running container (Send SIGTERM, and then SIGKILL after grace period) |
|
| 711 | 711 |
|
| 712 | 712 |
-t=10: Number of seconds to wait for the container to stop before killing it. |
| 713 |
+ |
|
| 714 |
+The main process inside the container will receive SIGTERM, and after a grace period, SIGKILL |
|
| 713 | 715 |
|
| 714 | 716 |
.. _cli_tag: |
| 715 | 717 |
|