diff options
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 4f8587186..51c2001d0 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -165,6 +165,17 @@ func (r *Runtime) removeContainer(c *Container, force bool) error { return errors.Wrapf(ErrCtrStateInvalid, "cannot remove container %s as it is %s - running or paused containers cannot be removed", c.ID(), c.state.State.String()) } + // Check that all of our exec sessions have finished + if len(c.state.ExecSessions) != 0 { + if force { + if err := r.ociRuntime.execStopContainer(c, c.StopTimeout()); err != nil { + return err + } + } else { + return errors.Wrapf(ErrCtrStateInvalid, "cannot remove container %s as it has active exec sessions", c.ID()) + } + } + // Check that no other containers depend on the container deps, err := r.state.ContainerInUse(c) if err != nil { |