Merge pull request #9951 from andersjanmyr/add-proxy-from-environment-to-client

Add ProxyFromEnvironment enables client via proxy.
Upstream-commit: ab86f591c323b38c918a026f38a26df120a475ac
Component: engine
This commit is contained in:
Jessie Frazelle
2015-01-13 10:53:00 -08:00

View File

@ -155,6 +155,7 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, key libtrust.PrivateKey,
// The transport is created here for reuse during the client session
tr := &http.Transport{
Proxy: http.ProxyFromEnvironment,
TLSClientConfig: tlsConfig,
}