Skip to content

Commit

Permalink
Merge pull request #9951 from andersjanmyr/add-proxy-from-environment…
Browse files Browse the repository at this point in the history
…-to-client

Add ProxyFromEnvironment enables client via proxy.
  • Loading branch information
Jessie Frazelle committed Jan 13, 2015
2 parents 21cf4b4 + 43d45e6 commit ab86f59
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions api/client/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down

0 comments on commit ab86f59

Please sign in to comment.