3 files changed, 54 insertions, 32 deletions
diff --git a/cmd/podman/cleanup.go b/cmd/podman/cleanup.go
index 9434c68ba..4ff744ae5 100644
--- a/cmd/podman/cleanup.go
+++ b/cmd/podman/cleanup.go
@@ -1,11 +1,8 @@
 package main
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/containers/libpod/cmd/podman/cliconfig"
-	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/pkg/adapter"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -49,38 +46,16 @@ func init() {
 }
 
 func cleanupCmd(c *cliconfig.CleanupValues) error {
-	runtime, err := libpodruntime.GetRuntime(getContext(), &c.PodmanCommand)
+	runtime, err := adapter.GetRuntime(getContext(), &c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
 	defer runtime.Shutdown(false)
 
-	cleanupContainers, lastError := getAllOrLatestContainers(&c.PodmanCommand, runtime, -1, "all")
-
-	ctx := getContext()
-
-	for _, ctr := range cleanupContainers {
-		hadError := false
-		if c.Remove {
-			if err := runtime.RemoveContainer(ctx, ctr, false, true); err != nil {
-				if lastError != nil {
-					fmt.Fprintln(os.Stderr, lastError)
-				}
-				lastError = errors.Wrapf(err, "failed to cleanup and remove container %v", ctr.ID())
-				hadError = true
-			}
-		} else {
-			if err := ctr.Cleanup(ctx); err != nil {
-				if lastError != nil {
-					fmt.Fprintln(os.Stderr, lastError)
-				}
-				lastError = errors.Wrapf(err, "failed to cleanup container %v", ctr.ID())
-				hadError = true
-			}
-		}
-		if !hadError {
-			fmt.Println(ctr.ID())
-		}
+	ok, failures, err := runtime.CleanupContainers(getContext(), c)
+	if err != nil {
+		return err
 	}
-	return lastError
+
+	return printCmdResults(ok, failures)
 }
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
index fb85e54ba..9ec897a60 100644
--- a/pkg/adapter/containers.go
+++ b/pkg/adapter/containers.go
@@ -834,3 +834,45 @@ func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool) ([
 	}
 	return pool.Run()
 }
+
+// CleanupContainers any leftovers bits of stopped containers
+func (r *LocalRuntime) CleanupContainers(ctx context.Context, cli *cliconfig.CleanupValues) ([]string, map[string]error, error) {
+	var (
+		ok       = []string{}
+		failures = map[string]error{}
+	)
+
+	ctrs, err := shortcuts.GetContainersByContext(cli.All, cli.Latest, cli.InputArgs, r.Runtime)
+	if err != nil {
+		return ok, failures, err
+	}
+
+	for _, ctr := range ctrs {
+		if cli.Remove {
+			err = removeContainer(ctx, ctr, r)
+		} else {
+			err = cleanupContainer(ctx, ctr, r)
+		}
+
+		if err == nil {
+			ok = append(ok, ctr.ID())
+		} else {
+			failures[ctr.ID()] = err
+		}
+	}
+	return ok, failures, nil
+}
+
+func removeContainer(ctx context.Context, ctr *libpod.Container, runtime *LocalRuntime) error {
+	if err := runtime.RemoveContainer(ctx, ctr, false, true); err != nil {
+		return errors.Wrapf(err, "failed to cleanup and remove container %v", ctr.ID())
+	}
+	return nil
+}
+
+func cleanupContainer(ctx context.Context, ctr *libpod.Container, runtime *LocalRuntime) error {
+	if err := ctr.Cleanup(ctx); err != nil {
+		return errors.Wrapf(err, "failed to cleanup container %v", ctr.ID())
+	}
+	return nil
+}
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go
index 5a67d4957..a3a48a564 100644
--- a/pkg/adapter/containers_remote.go
+++ b/pkg/adapter/containers_remote.go
@@ -883,3 +883,8 @@ func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool) ([
 	}
 	return ok, failures, nil
 }
+
+// Cleanup any leftovers bits of stopped containers
+func (r *LocalRuntime) CleanupContainers(ctx context.Context, cli *cliconfig.CleanupValues) ([]string, map[string]error, error) {
+	return nil, nil, errors.New("container cleanup not supported for remote clients")
+}