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

add name, http_proxy, https_proxy and no_proxy to docker info 

Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Victor Vieux 2015-07-03 02:44:04 -07:00 committed by Victor Vieux
parent 78676e5dac
commit e10b4555e7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/handlers.go
View File

@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"os"
"runtime" "runtime"
"sort" "sort"
"strconv" "strconv"
@ -37,6 +38,13 @@ func getInfo(c *context, w http.ResponseWriter, r *http.Request) {
BridgeNfIp6tables: true, BridgeNfIp6tables: true,
NCPU: c.cluster.TotalCpus(), NCPU: c.cluster.TotalCpus(),
MemTotal: c.cluster.TotalMemory(), MemTotal: c.cluster.TotalMemory(),
HttpProxy: os.Getenv("http_proxy"),
HttpsProxy: os.Getenv("https_proxy"),
NoProxy: os.Getenv("no_proxy"),
}
if hostname, err := os.Hostname(); err == nil {
info.Name = hostname
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")