From 7459c48863acea8453e0800124006a90ca82f646 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Thu, 10 Jan 2019 14:39:39 -0600
Subject: Add varlink support for prune

Add the ability to prune unused images using the varlink
API.

Signed-off-by: baude <bbaude@redhat.com>
---
 cmd/podman/images_prune.go           | 15 +++++++++++++--
 cmd/podman/shared/prune.go           | 24 ------------------------
 cmd/podman/varlink/io.podman.varlink |  4 ++++
 3 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 100644 cmd/podman/shared/prune.go

(limited to 'cmd')

diff --git a/cmd/podman/images_prune.go b/cmd/podman/images_prune.go
index cb72a498f..06879e02d 100644
--- a/cmd/podman/images_prune.go
+++ b/cmd/podman/images_prune.go
@@ -1,8 +1,8 @@
 package main
 
 import (
+	"fmt"
 	"github.com/containers/libpod/cmd/podman/libpodruntime"
-	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
@@ -30,5 +30,16 @@ func pruneImagesCmd(c *cli.Context) error {
 	}
 	defer runtime.Shutdown(false)
 
-	return shared.Prune(runtime.ImageRuntime())
+	pruneImages, err := runtime.ImageRuntime().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
 }
diff --git a/cmd/podman/shared/prune.go b/cmd/podman/shared/prune.go
deleted file mode 100644
index 90cfe4475..000000000
--- a/cmd/podman/shared/prune.go
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-}
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index 4e8b69faf..7cd6c16b2 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -1015,6 +1015,10 @@ method MountContainer(name: string) -> (path: string)
 # ~~~
 method  UnmountContainer(name: string, force: bool) -> ()
 
+# ImagesPrune removes all unused images from the local store.  Upon successful pruning,
+# the IDs of the removed images are returned.
+method ImagesPrune() -> (pruned: []string)
+
 # This function is not implemented yet.
 method ListContainerPorts(name: string) -> (notimplemented: NotImplemented)
 
-- 
cgit v1.2.3-54-g00ecf