1 files changed, 20 insertions, 16 deletions
diff --git a/cmd/podman/images_prune.go b/cmd/podman/images_prune.go
index 844984bb9..ba99c5bde 100644
--- a/cmd/podman/images_prune.go
+++ b/cmd/podman/images_prune.go
@@ -3,35 +3,39 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/libpod/adapter"
 	"github.com/pkg/errors"
-	"github.com/urfave/cli"
+	"github.com/spf13/cobra"
 )
 
 var (
+	pruneImagesCommand     cliconfig.PruneImagesValues
 	pruneImagesDescription = `
 	podman image prune
 
 	Removes all unnamed images from local storage
 `
-	pruneImageFlags = []cli.Flag{
-		cli.BoolFlag{
-			Name:  "all, a",
-			Usage: "Remove all unused images, not just dangling ones",
+	_pruneImagesCommand = &cobra.Command{
+		Use:   "prune",
+		Short: "Remove unused images",
+		Long:  pruneImagesDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			pruneImagesCommand.InputArgs = args
+			pruneImagesCommand.GlobalFlags = MainGlobalOpts
+			return pruneImagesCmd(&pruneImagesCommand)
 		},
 	}
-	pruneImagesCommand = cli.Command{
-		Name:         "prune",
-		Usage:        "Remove unused images",
-		Description:  pruneImagesDescription,
-		Action:       pruneImagesCmd,
-		OnUsageError: usageErrorHandler,
-		Flags:        pruneImageFlags,
-	}
 )
 
-func pruneImagesCmd(c *cli.Context) error {
-	runtime, err := adapter.GetRuntime(c)
+func init() {
+	pruneImagesCommand.Command = _pruneImagesCommand
+	flags := pruneImagesCommand.Flags()
+	flags.BoolVarP(&pruneImagesCommand.All, "all", "a", false, "Remove all unused images, not just dangling ones")
+}
+
+func pruneImagesCmd(c *cliconfig.PruneImagesValues) error {
+	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
@@ -39,7 +43,7 @@ func pruneImagesCmd(c *cli.Context) error {
 
 	// Call prune; if any cids are returned, print them and then
 	// return err in case an error also came up
-	pruneCids, err := runtime.PruneImages(c.Bool("all"))
+	pruneCids, err := runtime.PruneImages(c.All)
 	if len(pruneCids) > 0 {
 		for _, cid := range pruneCids {
 			fmt.Println(cid)