diff options
| author | baude <bbaude@redhat.com> | 2018-11-07 13:20:43 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2018-11-08 15:18:11 -0600 |
| commit | 2dd9cae37cb076418393ba61c0fb7b8cf97148f3 (patch) | |
| tree | 346e95940f263a5ea770be6f11ebe4130e8e626b /libpod/runtime_ctr.go | |
| parent | fa8cc1a94281aac1c52952a002f9c3dd31d91197 (diff) | |
| download | podman-2dd9cae37cb076418393ba61c0fb7b8cf97148f3.tar.gz podman-2dd9cae37cb076418393ba61c0fb7b8cf97148f3.tar.bz2 podman-2dd9cae37cb076418393ba61c0fb7b8cf97148f3.zip | |
rm -f now removes a paused container
We now can remove a paused container by sending it a kill signal while it
is paused. We then unpause the container and it is immediately killed.
Also, reworked how the parallelWorker results are handled to provide a
more consistent approach to how each subcommand implements it. It also
fixes a bug where if one container errors, the error message is duplicated
when printed out.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 09dc7c48b..09d0ec042 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -246,7 +246,19 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool) } if c.state.State == ContainerStatePaused { - return errors.Wrapf(ErrCtrStateInvalid, "container %s is paused, cannot remove until unpaused", c.ID()) + if !force { + return errors.Wrapf(ErrCtrStateInvalid, "container %s is paused, cannot remove until unpaused", c.ID()) + } + if err := c.runtime.ociRuntime.killContainer(c, 9); err != nil { + return err + } + if err := c.unpause(); err != nil { + return err + } + // Need to update container state to make sure we know it's stopped + if err := c.waitForExitFileAndSync(); err != nil { + return err + } } // Check that the container's in a good state to be removed |