diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-01-30 12:40:19 -0600 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-01-31 08:38:25 -0600 |
| commit | f1eaccedfa08455d699d00dcda63b95aeb34833e (patch) | |
| tree | 65d385fd683a66686b225827c760e5bc95f7e346 /pkg/api/handlers/utils/containers.go | |
| parent | 36af2833f954e1c822b917ecff45c05858188c2d (diff) | |
| download | podman-f1eaccedfa08455d699d00dcda63b95aeb34833e.tar.gz podman-f1eaccedfa08455d699d00dcda63b95aeb34833e.tar.bz2 podman-f1eaccedfa08455d699d00dcda63b95aeb34833e.zip | |
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 <bbaude@redhat.com>
Diffstat (limited to 'pkg/api/handlers/utils/containers.go')
| -rw-r--r-- | pkg/api/handlers/utils/containers.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go index 2c986db3a..74485edf2 100644 --- a/pkg/api/handlers/utils/containers.go +++ b/pkg/api/handlers/utils/containers.go @@ -9,7 +9,6 @@ import ( "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/define" - "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/pkg/errors" ) @@ -26,7 +25,7 @@ func KillContainer(w http.ResponseWriter, r *http.Request) (*libpod.Container, e Error(w, "Something went wrong.", http.StatusBadRequest, errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String())) return nil, err } - name := mux.Vars(r)["name"] + name := GetName(r) con, err := runtime.LookupContainer(name) if err != nil { ContainerNotFound(w, name, err) @@ -54,7 +53,7 @@ func KillContainer(w http.ResponseWriter, r *http.Request) (*libpod.Container, e func RemoveContainer(w http.ResponseWriter, r *http.Request, force, vols bool) { runtime := r.Context().Value("runtime").(*libpod.Runtime) - name := mux.Vars(r)["name"] + name := GetName(r) con, err := runtime.LookupContainer(name) if err != nil { ContainerNotFound(w, name, err) @@ -87,7 +86,7 @@ func WaitContainer(w http.ResponseWriter, r *http.Request) (int32, error) { UnSupportedParameter("condition") } - name := mux.Vars(r)["name"] + name := GetName(r) con, err := runtime.LookupContainer(name) if err != nil { ContainerNotFound(w, name, err) |