5 files changed, 134 insertions, 2 deletions
diff --git a/cmd/podman/container.go b/cmd/podman/container.go
index b6262f890..b0232c874 100644
--- a/cmd/podman/container.go
+++ b/cmd/podman/container.go
@@ -22,7 +22,7 @@ var (
 		mountCommand,
 		pauseCommand,
 		portCommand,
-		//		pruneCommand,
+		pruneContainersCommand,
 		refreshCommand,
 		restartCommand,
 		restoreCommand,
diff --git a/cmd/podman/containers_prune.go b/cmd/podman/containers_prune.go
new file mode 100644
index 000000000..92604e82f
--- /dev/null
+++ b/cmd/podman/containers_prune.go
@@ -0,0 +1,74 @@
+package main
+
+import (
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/cmd/podman/shared"
+	"github.com/containers/libpod/libpod"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
+)
+
+var (
+	pruneContainersDescription = `
+	podman container prune
+
+	Removes all exited containers
+`
+
+	pruneContainersCommand = cli.Command{
+		Name:         "prune",
+		Usage:        "Remove all stopped containers",
+		Description:  pruneContainersDescription,
+		Action:       pruneContainersCmd,
+		OnUsageError: usageErrorHandler,
+	}
+)
+
+func pruneContainersCmd(c *cli.Context) error {
+	var (
+		deleteFuncs []shared.ParallelWorkerInput
+	)
+
+	ctx := getContext()
+	runtime, err := libpodruntime.GetRuntime(c)
+	if err != nil {
+		return errors.Wrapf(err, "could not get runtime")
+	}
+	defer runtime.Shutdown(false)
+
+	filter := func(c *libpod.Container) bool {
+		state, _ := c.State()
+		if state == libpod.ContainerStateStopped || (state == libpod.ContainerStateExited && err == nil && c.PodID() == "") {
+			return true
+		}
+		return false
+	}
+	delContainers, err := runtime.GetContainers(filter)
+	if err != nil {
+		return err
+	}
+	if len(delContainers) < 1 {
+		return nil
+	}
+	for _, container := range delContainers {
+		con := container
+		f := func() error {
+			return runtime.RemoveContainer(ctx, con, c.Bool("force"))
+		}
+
+		deleteFuncs = append(deleteFuncs, shared.ParallelWorkerInput{
+			ContainerID:  con.ID(),
+			ParallelFunc: f,
+		})
+	}
+	maxWorkers := shared.Parallelize("rm")
+	if c.GlobalIsSet("max-workers") {
+		maxWorkers = c.GlobalInt("max-workers")
+	}
+	logrus.Debugf("Setting maximum workers to %d", maxWorkers)
+
+	// Run the parallel funcs
+	deleteErrors, errCount := shared.ParallelExecuteWorkerPool(maxWorkers, deleteFuncs)
+	return printParallelOutput(deleteErrors, errCount)
+}
diff --git a/cmd/podman/image.go b/cmd/podman/image.go
index 418b442e3..95af36df5 100644
--- a/cmd/podman/image.go
+++ b/cmd/podman/image.go
@@ -13,7 +13,7 @@ var (
 		inspectCommand,
 		loadCommand,
 		lsImagesCommand,
-		//		pruneCommand,
+		pruneImagesCommand,
 		pullCommand,
 		pushCommand,
 		rmImageCommand,
diff --git a/cmd/podman/images_prune.go b/cmd/podman/images_prune.go
new file mode 100644
index 000000000..cb72a498f
--- /dev/null
+++ b/cmd/podman/images_prune.go
@@ -0,0 +1,34 @@
+package main
+
+import (
+	"github.com/containers/libpod/cmd/podman/libpodruntime"
+	"github.com/containers/libpod/cmd/podman/shared"
+	"github.com/pkg/errors"
+	"github.com/urfave/cli"
+)
+
+var (
+	pruneImagesDescription = `
+	podman image prune
+
+	Removes all unnamed images from local storage
+`
+
+	pruneImagesCommand = cli.Command{
+		Name:         "prune",
+		Usage:        "Remove unused images",
+		Description:  pruneImagesDescription,
+		Action:       pruneImagesCmd,
+		OnUsageError: usageErrorHandler,
+	}
+)
+
+func pruneImagesCmd(c *cli.Context) error {
+	runtime, err := libpodruntime.GetRuntime(c)
+	if err != nil {
+		return errors.Wrapf(err, "could not get runtime")
+	}
+	defer runtime.Shutdown(false)
+
+	return shared.Prune(runtime.ImageRuntime())
+}
diff --git a/cmd/podman/shared/prune.go b/cmd/podman/shared/prune.go
new file mode 100644
index 000000000..90cfe4475
--- /dev/null
+++ b/cmd/podman/shared/prune.go
@@ -0,0 +1,24 @@
+package shared
+
+import (
+	"fmt"
+	"github.com/pkg/errors"
+
+	"github.com/containers/libpod/libpod/image"
+)
+
+// Prune removes all unnamed and unused images from the local store
+func Prune(ir *image.Runtime) error {
+	pruneImages, err := ir.GetPruneImages()
+	if err != nil {
+		return err
+	}
+
+	for _, i := range pruneImages {
+		if err := i.Remove(true); err != nil {
+			return errors.Wrapf(err, "failed to remove %s", i.ID())
+		}
+		fmt.Println(i.ID())
+	}
+	return nil
+}