diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-16 16:38:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-16 16:38:38 -0400 |
| commit | b9730d2e9b8cb7d7798929690fa020f180f2e1b2 (patch) | |
| tree | cbc1bebde8b80c8da472865fbe4a85a0146e59bf /libpod/runtime_ctr.go | |
| parent | bd94d84fadda7000da78e36d9865949dc8e7adb4 (diff) | |
| parent | 9148568b2610c6d1fa03d90acf1f77f7bcea6ba4 (diff) | |
| download | podman-b9730d2e9b8cb7d7798929690fa020f180f2e1b2.tar.gz podman-b9730d2e9b8cb7d7798929690fa020f180f2e1b2.tar.bz2 podman-b9730d2e9b8cb7d7798929690fa020f180f2e1b2.zip | |
Merge pull request #10062 from mheon/bump_311
Bump to v3.1.1
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 537618b65..f9b5c5c51 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -616,20 +616,6 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo } } - // Delete the container. - // Not needed in Configured and Exited states, where the container - // doesn't exist in the runtime - if c.state.State != define.ContainerStateConfigured && - c.state.State != define.ContainerStateExited { - if err := c.delete(ctx); err != nil { - if cleanupErr == nil { - cleanupErr = err - } else { - logrus.Errorf("delete container: %v", err) - } - } - } - // Remove the container from the state if c.config.Pod != "" { // If we're removing the pod, the container will be evicted |