diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-21 02:39:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-21 02:39:53 -0400 |
| commit | 9ef298e78438b2b8654bf87db157b4090b5e0523 (patch) | |
| tree | 271c5bcd00b416489bbfef7a9caac4418de738e0 /libpod | |
| parent | 101571dc6b02a042d5ad97de79b03d3ad5a1eeb6 (diff) | |
| parent | fd9dd7065d440f9d44d51ddccbda20c01ccdc1aa (diff) | |
| download | podman-9ef298e78438b2b8654bf87db157b4090b5e0523.tar.gz podman-9ef298e78438b2b8654bf87db157b4090b5e0523.tar.bz2 podman-9ef298e78438b2b8654bf87db157b4090b5e0523.zip | |
Merge pull request #10033 from nalind/just-remove-it
rmi: don't break when the image is missing a manifest
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/image/image.go | 3 | ||||
| -rw-r--r-- | libpod/runtime_img.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index 12dc22360..3c9fb3a37 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -617,7 +617,8 @@ func (i *Image) TopLayer() string { func (i *Image) Remove(ctx context.Context, force bool) error { parent, err := i.GetParent(ctx) if err != nil { - return err + logrus.Warnf("error determining parent of image: %v, ignoring the error", err) + parent = nil } if _, err := i.imageruntime.store.DeleteImage(i.ID(), true); err != nil { return err diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 3588467a5..2b101c01f 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -66,7 +66,8 @@ func (r *Runtime) RemoveImage(ctx context.Context, img *image.Image, force bool) hasChildren, err := img.IsParent(ctx) if err != nil { - return nil, err + logrus.Warnf("error determining if an image is a parent: %v, ignoring the error", err) + hasChildren = false } if (len(img.Names()) > 1 && !img.InputIsID()) || hasChildren { |