From fce2eaa6cae54cdf02741a78d97e0eb75993861f Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Wed, 9 Sep 2020 14:26:45 +0200 Subject: 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 --- pkg/api/handlers/compat/containers.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg') 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 -- cgit v1.2.3-54-g00ecf