Remove container from state before cleaning up.

Attempt to cleanup as much of the container as possible, even if one
of the cleanup stages fails.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #895
Approved by: mheon

1 files changed, 4 insertions, 5 deletions

diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 84724e013..f6d8fc32a 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -261,10 +261,6 @@ func (c *Container) setupStorage(ctx context.Context) error {
 
 // Tear down a container's storage prior to removal
 func (c *Container) teardownStorage() error {
-	if !c.valid {
-		return errors.Wrapf(ErrCtrRemoved, "container %s is not valid", c.ID())
-	}
-
 	if c.state.State == ContainerStateRunning || c.state.State == ContainerStatePaused {
 		return errors.Wrapf(ErrCtrStateInvalid, "cannot remove storage for container %s as it is running or paused", c.ID())
 	}
@@ -818,7 +814,10 @@ func (c *Container) cleanupStorage() error {
 	c.state.Mountpoint = ""
 	c.state.Mounted = false
 
-	return c.save()
+	if c.valid {
+		return c.save()
+	}
+	return nil
 }
 
 // Unmount the a container and free its resources