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/libpod/containers.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/libpod/containers.go')
| -rw-r--r-- | pkg/api/handlers/libpod/containers.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go index db1cf26ff..54acdbd36 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -9,7 +9,6 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/api/handlers" "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/pkg/errors" ) @@ -20,7 +19,7 @@ func StopContainer(w http.ResponseWriter, r *http.Request) { func ContainerExists(w http.ResponseWriter, r *http.Request) { runtime := r.Context().Value("runtime").(*libpod.Runtime) - name := mux.Vars(r)["name"] + name := utils.GetName(r) _, err := runtime.LookupContainer(name) if err != nil { utils.ContainerNotFound(w, name, err) @@ -105,7 +104,7 @@ func GetContainer(w http.ResponseWriter, r *http.Request) { return } runtime := r.Context().Value("runtime").(*libpod.Runtime) - name := mux.Vars(r)["name"] + name := utils.GetName(r) container, err := runtime.LookupContainer(name) if err != nil { utils.ContainerNotFound(w, name, err) @@ -147,7 +146,7 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) { func UnmountContainer(w http.ResponseWriter, r *http.Request) { runtime := r.Context().Value("runtime").(*libpod.Runtime) - name := mux.Vars(r)["name"] + name := utils.GetName(r) conn, err := runtime.LookupContainer(name) if err != nil { utils.ContainerNotFound(w, name, err) @@ -163,7 +162,7 @@ func UnmountContainer(w http.ResponseWriter, r *http.Request) { } func MountContainer(w http.ResponseWriter, r *http.Request) { runtime := r.Context().Value("runtime").(*libpod.Runtime) - name := mux.Vars(r)["name"] + name := utils.GetName(r) conn, err := runtime.LookupContainer(name) if err != nil { utils.ContainerNotFound(w, name, err) |