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

Merge pull request #4836 from atlassian/master 

Use environmental proxy when doing a ping to the remote repo
This commit is contained in:
Victor Vieux 2014-03-28 10:24:16 -07:00
parent 755cd48258 d6c2188cae
commit e13b4fd869
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
registry/registry.go
View File

@ -41,7 +41,10 @@ func pingRegistryEndpoint(endpoint string) (bool, error) {
conn.SetDeadline(time.Now().Add(time.Duration(10) * time.Second)) conn.SetDeadline(time.Now().Add(time.Duration(10) * time.Second))
return conn, nil return conn, nil
} }
httpTransport := &http.Transport{Dial: httpDial} httpTransport := &http.Transport{
Dial: httpDial,
Proxy: http.ProxyFromEnvironment,
}
client := &http.Client{Transport: httpTransport} client := &http.Client{Transport: httpTransport}
resp, err := client.Get(endpoint + "_ping") resp, err := client.Get(endpoint + "_ping")
if err != nil { if err != nil {