0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #17909 from LK4D4/info_simple

Browse source 
daemon/info.go: assign proxy fields directly
This commit is contained in:
Arnaud Porterie 2015-11-11 21:15:13 +01:00
commit 37dfae3cde
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
daemon/info.go
View file

@ -86,6 +86,9 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
ServerVersion: dockerversion.Version,
ClusterStore: daemon.config().ClusterStore,
ClusterAdvertise: daemon.config().ClusterAdvertise,
HTTPProxy: os.Getenv("http_proxy"),
HTTPSProxy: os.Getenv("https_proxy"),
NoProxy: os.Getenv("no_proxy"),
}
// TODO Windows. Refactor this more once sysinfo is refactored into
@ -100,15 +103,6 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
v.CPUCfsQuota = sysInfo.CPUCfsQuota
}
if httpProxy := os.Getenv("http_proxy"); httpProxy != "" {
v.HTTPProxy = httpProxy
}
if httpsProxy := os.Getenv("https_proxy"); httpsProxy != "" {
v.HTTPSProxy = httpsProxy
}
if noProxy := os.Getenv("no_proxy"); noProxy != "" {
v.NoProxy = noProxy
}
if hostname, err := os.Hostname(); err == nil {
v.Name = hostname
}