diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-31 08:06:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 08:06:41 -0800 |
| commit | 1cf4b72a6ea8f6fe8344e91badd19a8fe264193e (patch) | |
| tree | 835d3de0f328facc0d7c456ec3824f24fcf58e81 /pkg/api/handlers/generic/images.go | |
| parent | c29273e84f98e67589d8adcb7ab8d142d4563cd3 (diff) | |
| parent | f1eaccedfa08455d699d00dcda63b95aeb34833e (diff) | |
| download | podman-1cf4b72a6ea8f6fe8344e91badd19a8fe264193e.tar.gz podman-1cf4b72a6ea8f6fe8344e91badd19a8fe264193e.tar.bz2 podman-1cf4b72a6ea8f6fe8344e91badd19a8fe264193e.zip | |
Merge pull request #5030 from baude/apiv2longname
fix longname handling for bindings
Diffstat (limited to 'pkg/api/handlers/generic/images.go')
| -rw-r--r-- | pkg/api/handlers/generic/images.go | 5 |
1 files changed, 2 insertions, 3 deletions
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)) |