From 426953c86648af90206310040b29c60437d94f74 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 3 Mar 2015 16:30:31 -0800 Subject: [PATCH] add inspect for images Signed-off-by: Victor Vieux --- api/README.md | 1 - api/api.go | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/api/README.md b/api/README.md index ea753a30ff..7c25d88b93 100644 --- a/api/README.md +++ b/api/README.md @@ -14,7 +14,6 @@ Here are the main differences: ``` GET "/images/get" -GET "/images/{name:.*}/get" GET "/containers/{name:.*}/attach/ws" POST "/commit" diff --git a/api/api.go b/api/api.go index a1d23a8158..f183213b79 100644 --- a/api/api.go +++ b/api/api.go @@ -227,7 +227,7 @@ func postContainersCreate(c *context, w http.ResponseWriter, r *http.Request) { } // DELETE /containers/{name:.*} -func deleteContainer(c *context, w http.ResponseWriter, r *http.Request) { +func deleteContainers(c *context, w http.ResponseWriter, r *http.Request) { if err := r.ParseForm(); err != nil { httpError(w, err.Error(), http.StatusInternalServerError) return @@ -398,7 +398,7 @@ func createRouter(c *context, enableCors bool) *mux.Router { "/images/viz": notImplementedHandler, "/images/search": proxyRandom, "/images/get": notImplementedHandler, - "/images/{name:.*}/get": notImplementedHandler, + "/images/{name:.*}/get": proxyImage, "/images/{name:.*}/history": proxyImage, "/images/{name:.*}/json": proxyImage, "/containers/ps": getContainersJSON, @@ -437,7 +437,7 @@ func createRouter(c *context, enableCors bool) *mux.Router { "/exec/{execid:.*}/resize": proxyContainer, }, "DELETE": { - "/containers/{name:.*}": deleteContainer, + "/containers/{name:.*}": deleteContainers, "/images/{name:.*}": notImplementedHandler, }, "OPTIONS": {