docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_inspect'

This commit is contained in:
Victor Vieux 2015-01-14 22:34:13 +00:00
parent a403a99c1c a0f3f3440b
commit 9fdb28ebd4
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/api.go
View File

@ -119,7 +119,9 @@ func getContainersJSON(c *context, w http.ResponseWriter, r *http.Request) {
func getContainerJSON(c *context, w http.ResponseWriter, r *http.Request) { func getContainerJSON(c *context, w http.ResponseWriter, r *http.Request) {
container := c.cluster.Container(mux.Vars(r)["name"]) container := c.cluster.Container(mux.Vars(r)["name"])
if container != nil { if container != nil {
resp, err := http.Get(container.Node.Addr + "/containers/" + container.Id + "/json") client, scheme := newClientAndScheme(c.tlsConfig)
resp, err := client.Get(scheme + "://" + container.Node.Addr + "/containers/" + container.Id + "/json")
if err != nil { if err != nil {
httpError(w, err.Error(), http.StatusInternalServerError) httpError(w, err.Error(), http.StatusInternalServerError)
return return

21
api/utils.go
View File

@ -13,6 +13,13 @@ import (
"github.com/docker/swarm/cluster" "github.com/docker/swarm/cluster"
) )
func newClientAndScheme(tlsConfig *tls.Config) (*http.Client, string) {
if tlsConfig != nil {
return &http.Client{Transport: &http.Transport{TLSClientConfig: tlsConfig}}, "https"
}
return &http.Client{}, "http"
}
func getContainerFromVars(c *context, vars map[string]string) (*cluster.Container, error) { func getContainerFromVars(c *context, vars map[string]string) (*cluster.Container, error) {
if name, ok := vars["name"]; ok { if name, ok := vars["name"]; ok {
if container := c.cluster.Container(name); container != nil { if container := c.cluster.Container(name); container != nil {
@ -36,20 +43,12 @@ func getContainerFromVars(c *context, vars map[string]string) (*cluster.Containe
func proxy(tlsConfig *tls.Config, container *cluster.Container, w http.ResponseWriter, r *http.Request) error { func proxy(tlsConfig *tls.Config, container *cluster.Container, w http.ResponseWriter, r *http.Request) error {
// Use a new client for each request // Use a new client for each request
client := &http.Client{ client, scheme := newClientAndScheme(tlsConfig)
Transport: &http.Transport{
TLSClientConfig: tlsConfig,
},
}
// RequestURI may not be sent to client // RequestURI may not be sent to client
r.RequestURI = "" r.RequestURI = ""
if tlsConfig != nil { r.URL.Scheme = scheme
r.URL.Scheme = "https"
} else {
r.URL.Scheme = "http"
}
r.URL.Host = container.Node.Addr r.URL.Host = container.Node.Addr
log.Debugf("[PROXY] --> %s %s", r.Method, r.URL) log.Debugf("[PROXY] --> %s %s", r.Method, r.URL)