clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop

Browse Source 
Disable automatic killing of containers when docker stop fails
This commit is contained in:
Guillaume J. Charmes
2014-03-18 11:28:42 -07:00
parent 1e56ec8b67 8b5cf51d60
commit bfbf338f51
4 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/reference/api/docker_remote_api_v1.9.rst
+2 -2
View File
@@ -432,7 +432,7 @@ Stop a container
HTTP/1.1 204 OK
:query t: number of seconds to wait before killing the container
:query t: number of seconds to wait for the container to stop
:statuscode 204: no error
:statuscode 404: no such container
:statuscode 500: server error
@@ -457,7 +457,7 @@ Restart a container
HTTP/1.1 204 OK
:query t: number of seconds to wait before killing the container
:query t: number of seconds to wait for the container to stop
:statuscode 204: no error
:statuscode 404: no such container
:statuscode 500: server error
docs/sources/reference/commandline/cli.rst
+3 -3
View File
@@ -1371,11 +1371,11 @@ This example shows 5 containers that might be set up to test a web application c
Usage: docker stop [OPTIONS] CONTAINER [CONTAINER...]
Stop a running container (Send SIGTERM, and then SIGKILL after grace period)
Stop a running container (Send SIGTERM)
-t, --time=10: Number of seconds to wait for the container to stop before killing it.
-t, --time=10: Number of seconds to wait for the container to stop.
The main process inside the container will receive SIGTERM, and after a grace period, SIGKILL
The main process inside the container will receive SIGTERM.
.. _cli_tag: