summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-09-09 14:26:45 +0200
committerValentin Rothberg <rothberg@redhat.com>2020-09-09 14:38:28 +0200
commitfce2eaa6cae54cdf02741a78d97e0eb75993861f (patch)
treed27bc56d700087a0069d44619a7562e9854f33ac /pkg
parent6b1a1fcc5cb92a9fd5800b0d1af44f26093a8153 (diff)
downloadpodman-fce2eaa6cae54cdf02741a78d97e0eb75993861f.tar.gz
podman-fce2eaa6cae54cdf02741a78d97e0eb75993861f.tar.bz2
podman-fce2eaa6cae54cdf02741a78d97e0eb75993861f.zip
remote kill: don't wait for the container to stop
Invert the branch logic to match the comment. Docker seems to wait for the container while Podman does not. Enable the remote-disabled system test as well. Fixes: #7135 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/handlers/compat/containers.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 1ae6a990b..97f536666 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -174,7 +174,7 @@ func KillContainer(w http.ResponseWriter, r *http.Request) {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "unable to kill Container %s", name))
}
- if utils.IsLibpodRequest(r) {
+ if !utils.IsLibpodRequest(r) {
// the kill behavior for docker differs from podman in that they appear to wait
// for the Container to croak so the exit code is accurate immediately after the
// kill is sent. libpod does not. but we can add a wait here only for the docker