diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2022-05-12 17:00:44 -0400 |
---|---|---|
committer | Matthew Heon <mheon@redhat.com> | 2022-06-14 13:45:54 -0400 |
commit | 74ac2dda297eb315254e805c9a5c9b6a7c3eda89 (patch) | |
tree | ed97030768cc8b885f70288a3fb015fdee2a596b /pkg/api | |
parent | 5549495f4ebb0c971c61ebae67d2aa6079213901 (diff) | |
download | podman-74ac2dda297eb315254e805c9a5c9b6a7c3eda89.tar.gz podman-74ac2dda297eb315254e805c9a5c9b6a7c3eda89.tar.bz2 podman-74ac2dda297eb315254e805c9a5c9b6a7c3eda89.zip |
Deleting an n use image should return conflict not system error
Fixes: https://github.com/containers/podman/issues/14208
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/api')
-rw-r--r-- | pkg/api/handlers/compat/images_remove.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go index f45b38c66..35bcb36aa 100644 --- a/pkg/api/handlers/compat/images_remove.go +++ b/pkg/api/handlers/compat/images_remove.go @@ -52,7 +52,10 @@ func RemoveImage(w http.ResponseWriter, r *http.Request) { utils.ImageNotFound(w, name, errors.Wrapf(err, "failed to find image %s", name)) return } - + if errors.Cause(err) == storage.ErrImageUsedByContainer { + utils.Error(w, http.StatusConflict, errors.Wrapf(err, "image %s is in use", name)) + return + } utils.Error(w, http.StatusInternalServerError, err) return } |