summaryrefslogtreecommitdiff
path: root/libpod/oci.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-06-22 16:44:59 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-06-29 15:25:21 +0000
commit7fc1a329bd014d61f9895fc212aef452f6fb8f84 (patch)
tree9b67a2f36197369d487dd80927124e2dcb7056b8 /libpod/oci.go
parent41bd607c120dbd8b315eb30feb0fe63e079c821d (diff)
downloadpodman-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/oci.go')
-rw-r--r--libpod/oci.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/libpod/oci.go b/libpod/oci.go
index 871069627..dfed3d6b8 100644
--- a/libpod/oci.go
+++ b/libpod/oci.go
@@ -268,6 +268,12 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string) (er
if ctr.config.ConmonPidFile != "" {
args = append(args, "--conmon-pidfile", ctr.config.ConmonPidFile)
}
+ if len(ctr.config.ExitCommand) > 0 {
+ args = append(args, "--exit-command", ctr.config.ExitCommand[0])
+ for _, arg := range ctr.config.ExitCommand[1:] {
+ args = append(args, []string{"--exit-command-arg", arg}...)
+ }
+ }
args = append(args, "--socket-dir-path", r.socketsDir)
if ctr.config.Spec.Process.Terminal {
args = append(args, "-t")