From f1eaccedfa08455d699d00dcda63b95aeb34833e Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Thu, 30 Jan 2020 12:40:19 -0600 Subject: fix longname handling for bindings the api needs to account for image input where the image is encoded as a fqd image name. Signed-off-by: Brent Baude --- pkg/api/handlers/generic/images.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkg/api/handlers/generic/images.go') diff --git a/pkg/api/handlers/generic/images.go b/pkg/api/handlers/generic/images.go index ba1cf47b4..20dd84456 100644 --- a/pkg/api/handlers/generic/images.go +++ b/pkg/api/handlers/generic/images.go @@ -16,7 +16,6 @@ import ( "github.com/containers/libpod/pkg/api/handlers/utils" "github.com/containers/libpod/pkg/util" "github.com/docker/docker/api/types" - "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/pkg/errors" ) @@ -26,7 +25,7 @@ func ExportImage(w http.ResponseWriter, r *http.Request) { // 500 server runtime := r.Context().Value("runtime").(*libpod.Runtime) - name := mux.Vars(r)["name"] + name := utils.GetName(r) newImage, err := runtime.ImageRuntime().NewFromLocal(name) if err != nil { utils.ImageNotFound(w, name, errors.Wrapf(err, "Failed to find image %s", name)) @@ -285,7 +284,7 @@ func GetImage(w http.ResponseWriter, r *http.Request) { // 200 no error // 404 no such // 500 internal - name := mux.Vars(r)["name"] + name := utils.GetName(r) newImage, err := handlers.GetImage(r, name) if err != nil { utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Wrapf(err, "Failed to find image %s", name)) -- cgit v1.2.3-54-g00ecf