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/container_api.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/container_api.go')
-rw-r--r-- | libpod/container_api.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 5168dbc68..e36623529 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -183,7 +183,7 @@ func (c *Container) StopWithTimeout(timeout uint) error { return errors.Wrapf(define.ErrCtrStateInvalid, "can only stop created or running containers. %s is in state %s", c.ID(), c.state.State.String()) } - return c.stop(timeout, false) + return c.stop(timeout) } // Kill sends a signal to a container @@ -715,7 +715,7 @@ func (c *Container) Refresh(ctx context.Context) error { // Next, if the container is running, stop it if c.state.State == define.ContainerStateRunning { - if err := c.stop(c.config.StopTimeout, false); err != nil { + if err := c.stop(c.config.StopTimeout); err != nil { return err } } |