diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-20 12:13:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-20 12:13:22 +0100 |
| commit | e33d7e9fab9974c8c13868e7434f78feab7508af (patch) | |
| tree | 8eb093ebf09aed38f569534517e395c9439bec67 /libpod/runtime_ctr.go | |
| parent | 1ba6d0f883e17f2d460773f929873563b753d3e6 (diff) | |
| parent | 123b8c627d53c6bd76ff4d9f6a74674341a987c0 (diff) | |
| download | podman-e33d7e9fab9974c8c13868e7434f78feab7508af.tar.gz podman-e33d7e9fab9974c8c13868e7434f78feab7508af.tar.bz2 podman-e33d7e9fab9974c8c13868e7434f78feab7508af.zip | |
Merge pull request #4727 from rhatdan/pidns
if container is not in a pid namespace, stop all processes
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index d272e4549..3cf70f417 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -463,7 +463,7 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, // Check that the container's in a good state to be removed if c.state.State == define.ContainerStateRunning { - if err := c.stop(c.StopTimeout(), true); err != nil { + if err := c.stop(c.StopTimeout()); err != nil { return errors.Wrapf(err, "cannot remove container %s as it could not be stopped", c.ID()) } } |