1 files changed, 64 insertions, 39 deletions

diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go
index 7c0569b78..2dcb491d7 100644
--- a/cmd/podman/rm.go
+++ b/cmd/podman/rm.go
@@ -2,78 +2,92 @@ package main
 
 import (
 	"fmt"
+
+	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/containers/libpod/cmd/podman/shared"
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/image"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
+	"github.com/spf13/cobra"
 )
 
 var (
-	rmFlags = []cli.Flag{
-		cli.BoolFlag{
-			Name:  "all, a",
-			Usage: "Remove all containers",
-		},
-		cli.BoolFlag{
-			Name:  "force, f",
-			Usage: "Force removal of a running container.  The default is false",
-		},
-		LatestFlag,
-		cli.BoolFlag{
-			Name:  "volumes, v",
-			Usage: "Remove the volumes associated with the container (Not implemented yet)",
-		},
-	}
+	rmCommand     cliconfig.RmValues
 	rmDescription = fmt.Sprintf(`
 Podman rm will remove one or more containers from the host.
 The container name or ID can be used. This does not remove images.
 Running containers will not be removed without the -f option.
 `)
-	rmCommand = cli.Command{
-		Name:                   "rm",
-		Usage:                  "Remove one or more containers",
-		Description:            rmDescription,
-		Flags:                  sortFlags(rmFlags),
-		Action:                 rmCmd,
-		ArgsUsage:              "",
-		UseShortOptionHandling: true,
-		OnUsageError:           usageErrorHandler,
+	_rmCommand = &cobra.Command{
+		Use:   "rm",
+		Short: "Remove one or more containers",
+		Long:  rmDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			rmCommand.InputArgs = args
+			rmCommand.GlobalFlags = MainGlobalOpts
+			return rmCmd(&rmCommand)
+		},
+		Args: func(cmd *cobra.Command, args []string) error {
+			return checkAllAndLatest(cmd, args, false)
+		},
+		Example: `podman rm imageID
+  podman rm mywebserver myflaskserver 860a4b23
+  podman rm --force --all`,
 	}
 )
 
+func init() {
+	rmCommand.Command = _rmCommand
+	rmCommand.SetUsageTemplate(UsageTemplate())
+	flags := rmCommand.Flags()
+	flags.BoolVarP(&rmCommand.All, "all", "a", false, "Remove all containers")
+	flags.BoolVarP(&rmCommand.Force, "force", "f", false, "Force removal of a running container.  The default is false")
+	flags.BoolVarP(&rmCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of")
+	flags.BoolVarP(&rmCommand.Volumes, "volumes", "v", false, "Remove the volumes associated with the container")
+	markFlagHiddenForRemoteClient("latest", flags)
+}
+
 // saveCmd saves the image to either docker-archive or oci
-func rmCmd(c *cli.Context) error {
+func rmCmd(c *cliconfig.RmValues) error {
 	var (
 		deleteFuncs []shared.ParallelWorkerInput
 	)
 
 	ctx := getContext()
-	if err := validateFlags(c, rmFlags); err != nil {
-		return err
-	}
-	runtime, err := libpodruntime.GetRuntime(c)
+	runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
 	defer runtime.Shutdown(false)
 
-	if err := checkAllAndLatest(c); err != nil {
-		return err
-	}
-
-	delContainers, err := getAllOrLatestContainers(c, runtime, -1, "all")
+	failureCnt := 0
+	delContainers, err := getAllOrLatestContainers(&c.PodmanCommand, runtime, -1, "all")
 	if err != nil {
+		if c.Force && len(c.InputArgs) > 0 {
+			if errors.Cause(err) == libpod.ErrNoSuchCtr {
+				err = nil
+			} else {
+				failureCnt++
+			}
+			runtime.RemoveContainersFromStorage(c.InputArgs)
+		}
 		if len(delContainers) == 0 {
+			if err != nil && failureCnt == 0 {
+				exitCode = 1
+			}
 			return err
 		}
-		fmt.Println(err.Error())
+		if err != nil {
+			fmt.Println(err.Error())
+		}
 	}
 
 	for _, container := range delContainers {
 		con := container
 		f := func() error {
-			return runtime.RemoveContainer(ctx, con, c.Bool("force"))
+			return runtime.RemoveContainer(ctx, con, c.Force, c.Volumes)
 		}
 
 		deleteFuncs = append(deleteFuncs, shared.ParallelWorkerInput{
@@ -83,11 +97,22 @@ func rmCmd(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)
 
 	// Run the parallel funcs
 	deleteErrors, errCount := shared.ParallelExecuteWorkerPool(maxWorkers, deleteFuncs)
-	return printParallelOutput(deleteErrors, errCount)
+	err = printParallelOutput(deleteErrors, errCount)
+	if err != nil {
+		for _, result := range deleteErrors {
+			if result != nil && errors.Cause(result) != image.ErrNoSuchCtr {
+				failureCnt++
+			}
+		}
+		if failureCnt == 0 {
+			exitCode = 1
+		}
+	}
+	return err
 }