Merge pull request #5632 from jwhonce/wip/images

V2 podman image prune

3 files changed, 88 insertions, 2 deletions

diff --git a/cmd/podmanV2/images/images.go b/cmd/podmanV2/images/images.go
index f248aa65f..d00f0996e 100644
--- a/cmd/podmanV2/images/images.go
+++ b/cmd/podmanV2/images/images.go
@@ -15,7 +15,7 @@ var (
 		Args:    listCmd.Args,
 		Short:   listCmd.Short,
 		Long:    listCmd.Long,
-		PreRunE: listCmd.PreRunE,
+		PreRunE: preRunE,
 		RunE:    listCmd.RunE,
 		Example: strings.Replace(listCmd.Example, "podman image list", "podman images", -1),
 	}
diff --git a/cmd/podmanV2/images/list.go b/cmd/podmanV2/images/list.go
index 4714af3e4..9a5b47299 100644
--- a/cmd/podmanV2/images/list.go
+++ b/cmd/podmanV2/images/list.go
@@ -212,7 +212,7 @@ func imageListFormat(flags listFlagType) (string, string) {
 		row += "\t{{.Digest}}"
 	}
 
-	hdr += "\tID"
+	hdr += "\tIMAGE ID"
 	if flags.noTrunc {
 		row += "\tsha256:{{.ID}}"
 	} else {
diff --git a/cmd/podmanV2/images/prune.go b/cmd/podmanV2/images/prune.go
new file mode 100644
index 000000000..6577c458e
--- /dev/null
+++ b/cmd/podmanV2/images/prune.go
@@ -0,0 +1,86 @@
+package images
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/containers/libpod/cmd/podmanV2/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	pruneDescription = `Removes all unnamed images from local storage.
+
+  If an image is not being used by a container, it will be removed from the system.`
+	pruneCmd = &cobra.Command{
+		Use:     "prune",
+		Args:    cobra.NoArgs,
+		Short:   "Remove unused images",
+		Long:    pruneDescription,
+		RunE:    prune,
+		Example: `podman image prune`,
+	}
+
+	pruneOpts = entities.ImagePruneOptions{}
+	force     bool
+	filter    = []string{}
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: pruneCmd,
+		Parent:  imageCmd,
+	})
+
+	flags := pruneCmd.Flags()
+	flags.BoolVarP(&pruneOpts.All, "all", "a", false, "Remove all unused images, not just dangling ones")
+	flags.BoolVarP(&force, "force", "f", false, "Do not prompt for confirmation")
+	flags.StringArrayVar(&filter, "filter", []string{}, "Provide filter values (e.g. 'label=<key>=<value>')")
+
+}
+
+func prune(cmd *cobra.Command, args []string) error {
+	if !force {
+		reader := bufio.NewReader(os.Stdin)
+		fmt.Printf(`
+WARNING! This will remove all dangling images.
+Are you sure you want to continue? [y/N] `)
+		answer, err := reader.ReadString('\n')
+		if err != nil {
+			return errors.Wrapf(err, "error reading input")
+		}
+		if strings.ToLower(answer)[0] != 'y' {
+			return nil
+		}
+	}
+
+	// TODO Remove once filter refactor is finished and url.Values rules :)
+	for _, f := range filter {
+		t := strings.SplitN(f, "=", 2)
+		pruneOpts.Filters.Add(t[0], t[1])
+	}
+
+	results, err := registry.ImageEngine().Prune(registry.GetContext(), pruneOpts)
+	if err != nil {
+		return err
+	}
+
+	for _, i := range results.Report.Id {
+		fmt.Println(i)
+	}
+
+	for _, e := range results.Report.Err {
+		fmt.Fprint(os.Stderr, e.Error()+"\n")
+	}
+
+	if results.Size > 0 {
+		fmt.Fprintf(os.Stdout, "Size: %d\n", results.Size)
+	}
+
+	return nil
+}