From 69962682e990ddb9437291b98bd335e74c090fc8 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Thu, 18 Apr 2019 10:34:27 -0700 Subject: Refactor of 'podman prune' to better support remote * Push iterations into the service not the client * Add e2e tests * Refactor to use new frameworks Signed-off-by: Jhon Honce --- cmd/podman/system_prune.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'cmd/podman/system_prune.go') diff --git a/cmd/podman/system_prune.go b/cmd/podman/system_prune.go index 14cb96941..8900e2644 100644 --- a/cmd/podman/system_prune.go +++ b/cmd/podman/system_prune.go @@ -82,13 +82,21 @@ Are you sure you want to continue? [y/N] `, volumeString) ctx := getContext() fmt.Println("Deleted Containers") lasterr := pruneContainers(runtime, ctx, rmWorkers, false, false) + fmt.Println("Deleted Pods") - if err := prunePods(runtime, ctx, rmWorkers, true); err != nil { + pruneValues := cliconfig.PodPruneValues{ + PodmanCommand: c.PodmanCommand, + Force: c.Force, + } + ok, failures, err := runtime.PrunePods(ctx, &pruneValues) + if err != nil { if lasterr != nil { logrus.Errorf("%q", lasterr) } lasterr = err } + printCmdResults(ok, failures) + if c.Bool("volumes") { fmt.Println("Deleted Volumes") err := volumePrune(runtime, getContext()) -- cgit v1.2.3-54-g00ecf