summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-12-17 11:07:21 -0600
committerbaude <bbaude@redhat.com>2018-12-17 11:11:23 -0600
commitf020f3146d33ab68c557cbbec5d6a1be7ad15f7f (patch)
tree9366317d9c3fcfbba978bd24d1dc3a50b8dbdbeb
parentb21d47434f49e1d57fa2b0329ee90eef80b70714 (diff)
downloadpodman-f020f3146d33ab68c557cbbec5d6a1be7ad15f7f.tar.gz
podman-f020f3146d33ab68c557cbbec5d6a1be7ad15f7f.tar.bz2
podman-f020f3146d33ab68c557cbbec5d6a1be7ad15f7f.zip
display proper error when rmi -fa with infra containers
when deleting infra containers, we were not checking the error of the image deletion and therefore resulting in not reporting the error. Fixes #1991 Signed-off-by: baude <bbaude@redhat.com>
-rw-r--r--cmd/podman/rmi.go25
1 files changed, 19 insertions, 6 deletions
diff --git a/cmd/podman/rmi.go b/cmd/podman/rmi.go
index 0f4f8765b..910c7ba35 100644
--- a/cmd/podman/rmi.go
+++ b/cmd/podman/rmi.go
@@ -46,6 +46,13 @@ var (
)
func rmiCmd(c *cli.Context) error {
+ var (
+ lastError error
+ deleted bool
+ deleteErr error
+ msg string
+ )
+
ctx := getContext()
if err := validateFlags(c, rmiFlags); err != nil {
return err
@@ -66,20 +73,18 @@ func rmiCmd(c *cli.Context) error {
}
images := args[:]
- var lastError error
- var deleted bool
removeImage := func(img *image.Image) {
deleted = true
- msg, err := runtime.RemoveImage(ctx, img, c.Bool("force"))
- if err != nil {
- if errors.Cause(err) == storage.ErrImageUsedByContainer {
+ msg, deleteErr = runtime.RemoveImage(ctx, img, c.Bool("force"))
+ if deleteErr != nil {
+ if errors.Cause(deleteErr) == storage.ErrImageUsedByContainer {
fmt.Printf("A container associated with containers/storage, i.e. via Buildah, CRI-O, etc., may be associated with this image: %-12.12s\n", img.ID())
}
if lastError != nil {
fmt.Fprintln(os.Stderr, lastError)
}
- lastError = err
+ lastError = deleteErr
} else {
fmt.Println(msg)
}
@@ -108,6 +113,14 @@ func rmiCmd(c *cli.Context) error {
}
lastNumberofImages = len(imagesToDelete)
imagesToDelete, err = runtime.ImageRuntime().GetImages()
+ if err != nil {
+ return err
+ }
+ // If no images are left to delete or there is just one image left and it cannot be deleted,
+ // lets break out and display the error
+ if len(imagesToDelete) == 0 || (lastNumberofImages == 1 && lastError != nil) {
+ break
+ }
}
} else {
// Create image.image objects for deletion from user input.