diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-03-27 16:26:36 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-03-31 08:50:32 -0400 |
| commit | 3449b27cd1743a1353ea8c4503eec5d126d04b0d (patch) | |
| tree | b4c65b7cbbc1307e6a4c021531f4b7a1e53b4c8d /docs/source/markdown/podman-stop.1.md | |
| parent | 9c7410d331ed6c9af50babb41314bfa67a3f39e0 (diff) | |
| download | podman-3449b27cd1743a1353ea8c4503eec5d126d04b0d.tar.gz podman-3449b27cd1743a1353ea8c4503eec5d126d04b0d.tar.bz2 podman-3449b27cd1743a1353ea8c4503eec5d126d04b0d.zip | |
Switch to using --time as opposed to --timeout to better match Docker.
We need to consistently use --time rather then --timeout throughout the code.
Fix locations where timeout defaults are not set correctly as well.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'docs/source/markdown/podman-stop.1.md')
| -rw-r--r-- | docs/source/markdown/podman-stop.1.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/source/markdown/podman-stop.1.md b/docs/source/markdown/podman-stop.1.md index 23b3415e9..1534063a5 100644 --- a/docs/source/markdown/podman-stop.1.md +++ b/docs/source/markdown/podman-stop.1.md @@ -9,7 +9,7 @@ podman\-stop - Stop one or more running containers **podman container stop** [*options*] *container* ... ## DESCRIPTION -Stops one or more containers. You may use container IDs or names as input. The **--timeout** switch +Stops one or more containers. You may use container IDs or names as input. The **--time** switch allows you to specify the number of seconds to wait before forcibly stopping the container after the stop command is issued to the container. The default is 10 seconds. By default, containers are stopped with SIGTERM and then SIGKILL after the timeout. The SIGTERM default can be overridden by the image used to create the @@ -54,7 +54,7 @@ $ podman stop --cidfile /home/user/cidfile-1 $ podman stop --cidfile /home/user/cidfile-1 --cidfile ./cidfile-2 -$ podman stop --timeout 2 860a4b235279 +$ podman stop --time 2 860a4b235279 $ podman stop -a |