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

Merge pull request #246 from vieux/add_search_login

Browse Source 
add search and login
This commit is contained in:
Victor Vieux
2015-01-15 11:35:10 -08:00
parent 3f55099c06 7260a66886
commit 29df40f95f
4 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/README.md
View File

@@ -10,14 +10,12 @@ Here are the main differences:
```
GET "/images/json"
GET "/images/json"
GET "/images/search"
GET "/images/get"
GET "/images/{name:.*}/get"
GET "/images/{name:.*}/history"
GET "/images/{name:.*}/json"
GET "/containers/{name:.*}/attach/ws"
POST "/auth"
POST "/commit"
POST "/build"
POST "/images/create"

29
api/api.go
View File

@@ -6,6 +6,7 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
"math/rand"
"net/http"
"runtime"
"sort"
@@ -14,6 +15,7 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/docker/swarm/cluster"
"github.com/docker/swarm/scheduler"
"github.com/docker/swarm/scheduler/filter"
"github.com/gorilla/mux"
"github.com/samalba/dockerclient"
)
@@ -229,7 +231,7 @@ func proxyContainerAndForceRefresh(c *context, w http.ResponseWriter, r *http.Re
return
}
if err := proxy(c.tlsConfig, container, w, r); err != nil {
if err := proxy(c.tlsConfig, container.Node.Addr, w, r); err != nil {
httpError(w, err.Error(), http.StatusInternalServerError)
}
@@ -245,7 +247,24 @@ func proxyContainer(c *context, w http.ResponseWriter, r *http.Request) {
return
}
if err := proxy(c.tlsConfig, container, w, r); err != nil {
if err := proxy(c.tlsConfig, container.Node.Addr, w, r); err != nil {
httpError(w, err.Error(), http.StatusInternalServerError)
}
}
// Proxy a request to a random node
func proxyRandom(c *context, w http.ResponseWriter, r *http.Request) {
candidates := c.cluster.Nodes()
healthFilter := &filter.HealthFilter{}
accepted, err := healthFilter.Filter(nil, candidates)
if err != nil {
httpError(w, err.Error(), http.StatusInternalServerError)
return
}
if err := proxy(c.tlsConfig, accepted[rand.Intn(len(accepted))].Addr, w, r); err != nil {
httpError(w, err.Error(), http.StatusInternalServerError)
}
}
@@ -258,7 +277,7 @@ func proxyHijack(c *context, w http.ResponseWriter, r *http.Request) {
return
}
if err := hijack(c.tlsConfig, container, w, r); err != nil {
if err := hijack(c.tlsConfig, container.Node.Addr, w, r); err != nil {
httpError(w, err.Error(), http.StatusInternalServerError)
}
}
@@ -293,7 +312,7 @@ func createRouter(c *context, enableCors bool) *mux.Router {
"/version": getVersion,
"/images/json": notImplementedHandler,
"/images/viz": notImplementedHandler,
"/images/search": notImplementedHandler,
"/images/search": proxyRandom,
"/images/get": notImplementedHandler,
"/images/{name:.*}/get": notImplementedHandler,
"/images/{name:.*}/history": notImplementedHandler,
@@ -309,7 +328,7 @@ func createRouter(c *context, enableCors bool) *mux.Router {
"/exec/{execid:.*}/json": proxyContainer,
},
"POST": {
"/auth": notImplementedHandler,
"/auth": proxyRandom,
"/commit": notImplementedHandler,
"/build": notImplementedHandler,
"/images/create": notImplementedHandler,

10
api/utils.go
View File

@@ -51,15 +51,14 @@ func copyHeader(dst, src http.Header) {
}
}
func proxy(tlsConfig *tls.Config, container *cluster.Container, w http.ResponseWriter, r *http.Request) error {
func proxy(tlsConfig *tls.Config, addr string, w http.ResponseWriter, r *http.Request) error {
// Use a new client for each request
client, scheme := newClientAndScheme(tlsConfig)
// RequestURI may not be sent to client
r.RequestURI = ""
r.URL.Scheme = scheme
r.URL.Host = container.Node.Addr
r.URL.Host = addr
log.Debugf("[PROXY] --> %s %s", r.Method, r.URL)
resp, err := client.Do(r)
@@ -74,9 +73,8 @@ func proxy(tlsConfig *tls.Config, container *cluster.Container, w http.ResponseW
return nil
}
func hijack(tlsConfig *tls.Config, container *cluster.Container, w http.ResponseWriter, r *http.Request) error {
addr := container.Node.Addr
if parts := strings.SplitN(container.Node.Addr, "://", 2); len(parts) == 2 {
func hijack(tlsConfig *tls.Config, addr string, w http.ResponseWriter, r *http.Request) error {
if parts := strings.SplitN(addr, "://", 2); len(parts) == 2 {
addr = parts[1]
}

2
scheduler/filter/health.go
View File

@@ -15,7 +15,7 @@ var (
type HealthFilter struct {
}
func (f *HealthFilter) Filter(config *dockerclient.ContainerConfig, nodes []*cluster.Node) ([]*cluster.Node, error) {
func (f *HealthFilter) Filter(_ *dockerclient.ContainerConfig, nodes []*cluster.Node) ([]*cluster.Node, error) {
result := []*cluster.Node{}
for _, node := range nodes {
if node.IsHealthy() {