diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2020-10-28 14:51:18 -0400 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-10-28 16:02:53 -0400 |
commit | 99d3e2e9d72f93399a2d3a5974eea0df6362153f (patch) | |
tree | 3f5f22edc53828c52fc4e58f7305fcca90c293ea /pkg/api | |
parent | e04e567b96cafae30863c7782f7bc10c55bfb681 (diff) | |
download | podman-99d3e2e9d72f93399a2d3a5974eea0df6362153f.tar.gz podman-99d3e2e9d72f93399a2d3a5974eea0df6362153f.tar.bz2 podman-99d3e2e9d72f93399a2d3a5974eea0df6362153f.zip |
NewFromLocal can return multiple images
If you use additional stores and pull the same image into
writable stores, you can end up with the situation where
you have the same image twice. This causes image exists
to return the wrong error. It should return true in this
situation rather then an error.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/api')
-rw-r--r-- | pkg/api/handlers/libpod/images.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 598a46abe..55264b3b6 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -44,11 +44,16 @@ func ImageExists(w http.ResponseWriter, r *http.Request) { runtime := r.Context().Value("runtime").(*libpod.Runtime) name := utils.GetName(r) - _, err := runtime.ImageRuntime().NewFromLocal(name) + ir := abi.ImageEngine{Libpod: runtime} + report, err := ir.Exists(r.Context(), name) if err != nil { utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Wrapf(err, "failed to find image %s", name)) return } + if !report.Value { + utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Wrapf(nil, "failed to find image %s", name)) + return + } utils.WriteResponse(w, http.StatusNoContent, "") } |