diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-22 16:44:59 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-29 15:25:21 +0000 |
| commit | 7fc1a329bd014d61f9895fc212aef452f6fb8f84 (patch) | |
| tree | 9b67a2f36197369d487dd80927124e2dcb7056b8 /libpod/container_internal.go | |
| parent | 41bd607c120dbd8b315eb30feb0fe63e079c821d (diff) | |
| download | podman-7fc1a329bd014d61f9895fc212aef452f6fb8f84.tar.gz podman-7fc1a329bd014d61f9895fc212aef452f6fb8f84.tar.bz2 podman-7fc1a329bd014d61f9895fc212aef452f6fb8f84.zip | |
Add `podman container cleanup` to CLI
When we run containers in detach mode, nothing cleans up the network stack or
the mount points. This patch will tell conmon to execute the cleanup code when
the container exits.
It can also be called to attempt to cleanup previously running containers.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #942
Approved by: mheon
Diffstat (limited to 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index ba6cbe5aa..5c5bf8062 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -695,7 +695,8 @@ func (c *Container) stop(timeout uint) error { return err } - return c.cleanup() + // Container should clean itself up + return nil } // Internal, non-locking function to pause a container @@ -928,11 +929,17 @@ func (c *Container) cleanup() error { } if err := c.cleanupCgroups(); err != nil { - if lastError != nil { - logrus.Errorf("Error cleaning up container %s CGroups: %v", c.ID(), err) - } else { - lastError = err - } + /* + if lastError != nil { + logrus.Errorf("Error cleaning up container %s CGroups: %v", c.ID(), err) + } else { + lastError = err + } + */ + // For now we are going to only warn on failures to clean up cgroups + // We have a conflict with running podman containers cleanup in same cgroup as container + logrus.Warnf("Ignoring Error cleaning up container %s CGroups: %v", c.ID(), err) + } // Unmount storage |