From 7fc1a329bd014d61f9895fc212aef452f6fb8f84 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 22 Jun 2018 16:44:59 -0400 Subject: 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 Closes: #942 Approved by: mheon --- pkg/spec/createconfig.go | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'pkg/spec') diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index af0a62c65..27df0c395 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -316,8 +316,25 @@ func (c *CreateConfig) GetTmpfsMounts() []spec.Mount { return m } +func createExitCommand(runtime *libpod.Runtime) []string { + config := runtime.GetConfig() + + cmd, _ := os.Executable() + command := []string{cmd, + "--root", config.StorageConfig.GraphRoot, + "--runroot", config.StorageConfig.RunRoot, + "--log-level", logrus.GetLevel().String(), + "--cgroup-manager", config.CgroupManager, + "--tmpdir", config.TmpDir, + } + if config.StorageConfig.GraphDriverName != "" { + command = append(command, []string{"--storage-driver", config.StorageConfig.GraphDriverName}...) + } + return append(command, []string{"container", "cleanup"}...) +} + // GetContainerCreateOptions takes a CreateConfig and returns a slice of CtrCreateOptions -func (c *CreateConfig) GetContainerCreateOptions() ([]libpod.CtrCreateOption, error) { +func (c *CreateConfig) GetContainerCreateOptions(runtime *libpod.Runtime) ([]libpod.CtrCreateOption, error) { var options []libpod.CtrCreateOption var portBindings []ocicni.PortMapping var err error @@ -434,6 +451,9 @@ func (c *CreateConfig) GetContainerCreateOptions() ([]libpod.CtrCreateOption, er if c.CgroupParent != "" { options = append(options, libpod.WithCgroupParent(c.CgroupParent)) } + if c.Detach { + options = append(options, libpod.WithExitCommand(createExitCommand(runtime))) + } return options, nil } -- cgit v1.2.3-54-g00ecf