diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-05 10:30:05 -0500 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-05 10:39:17 -0500 |
commit | d107c37296d3ad0173e2905ebff0f89fc416e91d (patch) | |
tree | e9646d22302a2398bac7a4ac796d1a2e4ccbb225 /pkg/api/handlers | |
parent | 0bac30d724643cf84d49e643a17bd8fd304efde1 (diff) | |
download | podman-d107c37296d3ad0173e2905ebff0f89fc416e91d.tar.gz podman-d107c37296d3ad0173e2905ebff0f89fc416e91d.tar.bz2 podman-d107c37296d3ad0173e2905ebff0f89fc416e91d.zip |
podman-remote stop -time 0 does not work
This patch will allow users to pass in the time 0.
Currently the timeout will take 10 seconds if user passes
in the 0 flag.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/api/handlers')
-rw-r--r-- | pkg/api/handlers/compat/containers_stop.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/containers_stop.go b/pkg/api/handlers/compat/containers_stop.go index 0526865b9..3ae223693 100644 --- a/pkg/api/handlers/compat/containers_stop.go +++ b/pkg/api/handlers/compat/containers_stop.go @@ -39,11 +39,11 @@ func StopContainer(w http.ResponseWriter, r *http.Request) { Ignore: query.Ignore, } if utils.IsLibpodRequest(r) { - if query.LibpodTimeout > 0 { + if _, found := r.URL.Query()["timeout"]; found { options.Timeout = &query.LibpodTimeout } } else { - if query.DockerTimeout > 0 { + if _, found := r.URL.Query()["t"]; found { options.Timeout = &query.DockerTimeout } } |