centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 08:18:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix image match and fix docker save

Browse Source 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
This commit is contained in:
Xian Chaobo
2015-05-19 05:21:14 -04:00
parent 1f5d66d1f1
commit 064e91cd23
4 changed files with 59 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/handlers.go
View File

@@ -62,6 +62,20 @@ func getVersion(c *context, w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode(version)
}
// GET /images/{name:.*}/get
func getImage(c *context, w http.ResponseWriter, r *http.Request) {
name := mux.Vars(r)["name"]
for _, image := range c.cluster.Images() {
if len(strings.SplitN(name, ":", 2)) == 2 && image.Match(name) ||
len(strings.SplitN(name, ":", 2)) == 1 && image.MatchWithoutTag(name) {
proxy(c.tlsConfig, image.Engine.Addr, w, r)
return
}
}
httpError(w, fmt.Sprintf("No such image: %s", name), http.StatusNotFound)
}
// GET /images/get
func getImages(c *context, w http.ResponseWriter, r *http.Request) {
if err := r.ParseForm(); err != nil {
@@ -83,7 +97,8 @@ func getImages(c *context, w http.ResponseWriter, r *http.Request) {
// Count how many images we need it has.
for _, name := range names {
for _, image := range images {
if image.Match(name) {
if len(strings.SplitN(name, ":", 2)) == 2 && image.Match(name) ||
len(strings.SplitN(name, ":", 2)) == 1 && image.MatchWithoutTag(name) {
matchedImages = matchedImages + 1
break
}

2
api/router.go
View File

@@ -29,7 +29,7 @@ var routes = map[string]map[string]handler{
"/images/viz": notImplementedHandler,
"/images/search": proxyRandom,
"/images/get": getImages,
"/images/{name:.*}/get": proxyImage,
"/images/{name:.*}/get": getImage,
"/images/{name:.*}/history": proxyImage,
"/images/{name:.*}/json": proxyImage,
"/containers/ps": getContainersJSON,