From 6847636c30bb3b70882000189946cb36cc5a246a Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 4 Jan 2018 15:29:36 -0600 Subject: Remove by shortname Removing by shortname was not working. Also pruned container storage's remove func from rmi and moved it into an image.Remove func, which consolidates our usage of cs. Signed-off-by: baude Closes: #188 Approved by: baude --- cmd/podman/rmi.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/rmi.go b/cmd/podman/rmi.go index 98ecc1883..f5938ffb9 100644 --- a/cmd/podman/rmi.go +++ b/cmd/podman/rmi.go @@ -64,22 +64,15 @@ func rmiCmd(c *cli.Context) error { } for _, arg := range imagesToDelete { - image, err := runtime.GetImage(arg) + image := runtime.NewImage(arg) + iid, err := image.Remove(c.Bool("force")) if err != nil { if lastError != nil { fmt.Fprintln(os.Stderr, lastError) } - lastError = errors.Wrapf(err, "could not get image %q", arg) - continue - } - id, err := runtime.RemoveImage(image, c.Bool("force")) - if err != nil { - if lastError != nil { - fmt.Fprintln(os.Stderr, lastError) - } - lastError = errors.Wrapf(err, "failed to remove image") + lastError = err } else { - fmt.Println(id) + fmt.Println(iid) } } return lastError -- cgit v1.2.3-54-g00ecf