1 files changed, 26 insertions, 15 deletions
diff --git a/cmd/podman/containers_prune.go b/cmd/podman/containers_prune.go
index 09141e9a3..6e4960429 100644
--- a/cmd/podman/containers_prune.go
+++ b/cmd/podman/containers_prune.go
@@ -3,31 +3,42 @@ package main
 import (
 	"context"
 
+	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/libpod"
-	"github.com/containers/libpod/libpod/adapter"
+	"github.com/containers/libpod/pkg/adapter"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
+	"github.com/spf13/cobra"
 )
 
 var (
+	pruneContainersCommand     cliconfig.PruneContainersValues
 	pruneContainersDescription = `
 	podman container prune
 
 	Removes all exited containers
 `
-
-	pruneContainersCommand = cli.Command{
-		Name:         "prune",
-		Usage:        "Remove all stopped containers",
-		Description:  pruneContainersDescription,
-		Action:       pruneContainersCmd,
-		OnUsageError: usageErrorHandler,
+	_pruneContainersCommand = &cobra.Command{
+		Use:   "prune",
+		Short: "Remove all stopped containers",
+		Long:  pruneContainersDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			pruneContainersCommand.InputArgs = args
+			pruneContainersCommand.GlobalFlags = MainGlobalOpts
+			return pruneContainersCmd(&pruneContainersCommand)
+		},
 	}
 )
 
-func pruneContainers(runtime *adapter.LocalRuntime, ctx context.Context, maxWorkers int, force bool) error {
+func init() {
+	pruneContainersCommand.Command = _pruneContainersCommand
+	pruneContainersCommand.SetUsageTemplate(UsageTemplate())
+	flags := pruneContainersCommand.Flags()
+	flags.BoolVarP(&pruneContainersCommand.Force, "force", "f", false, "Force removal of a running container.  The default is false")
+}
+
+func pruneContainers(runtime *adapter.LocalRuntime, ctx context.Context, maxWorkers int, force, volumes bool) error {
 	var deleteFuncs []shared.ParallelWorkerInput
 
 	filter := func(c *libpod.Container) bool {
@@ -47,7 +58,7 @@ func pruneContainers(runtime *adapter.LocalRuntime, ctx context.Context, maxWork
 	for _, container := range delContainers {
 		con := container
 		f := func() error {
-			return runtime.RemoveContainer(ctx, con, force)
+			return runtime.RemoveContainer(ctx, con, force, volumes)
 		}
 
 		deleteFuncs = append(deleteFuncs, shared.ParallelWorkerInput{
@@ -60,8 +71,8 @@ func pruneContainers(runtime *adapter.LocalRuntime, ctx context.Context, maxWork
 	return printParallelOutput(deleteErrors, errCount)
 }
 
-func pruneContainersCmd(c *cli.Context) error {
-	runtime, err := adapter.GetRuntime(c)
+func pruneContainersCmd(c *cliconfig.PruneContainersValues) error {
+	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
@@ -69,9 +80,9 @@ func pruneContainersCmd(c *cli.Context) error {
 
 	maxWorkers := shared.Parallelize("rm")
 	if c.GlobalIsSet("max-workers") {
-		maxWorkers = c.GlobalInt("max-workers")
+		maxWorkers = c.GlobalFlags.MaxWorks
 	}
 	logrus.Debugf("Setting maximum workers to %d", maxWorkers)
 
-	return pruneContainers(runtime, getContext(), maxWorkers, c.Bool("force"))
+	return pruneContainers(runtime, getContext(), maxWorkers, c.Bool("force"), c.Bool("volumes"))
 }