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

Merge pull request #4427 from thaJeztah/context_inline_vars 

cli/context/docker: Endpoint.ClientOpts, withHTTPClient: inline variables
This commit is contained in:
Sebastiaan van Stijn 2023-07-17 13:08:29 +02:00 committed by GitHub
parent 92b9f94a7c 223bf80d4b
commit ce9f15c24c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cli/context/docker/load.go
View File

@ -100,15 +100,13 @@ func (ep *Endpoint) ClientOpts() ([]client.Opt, error) {
) )
} else { } else {
httpClient := &http.Client{ result = append(result,
// No tls client.WithHTTPClient(&http.Client{
// No proxy // No TLS, and no proxy.
Transport: &http.Transport{ Transport: &http.Transport{
DialContext: helper.Dialer, DialContext: helper.Dialer,
}, },
} }),
result = append(result,
client.WithHTTPClient(httpClient),
client.WithHost(helper.Host), client.WithHost(helper.Host),
client.WithDialContext(helper.Dialer), client.WithDialContext(helper.Dialer),
) )
@ -125,8 +123,7 @@ func withHTTPClient(tlsConfig *tls.Config) func(*client.Client) error {
// Use the default HTTPClient // Use the default HTTPClient
return nil return nil
} }
return client.WithHTTPClient(&http.Client{
httpClient := &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
TLSClientConfig: tlsConfig, TLSClientConfig: tlsConfig,
DialContext: (&net.Dialer{ DialContext: (&net.Dialer{
@ -135,8 +132,7 @@ func withHTTPClient(tlsConfig *tls.Config) func(*client.Client) error {
}).DialContext, }).DialContext,
}, },
CheckRedirect: client.CheckRedirect, CheckRedirect: client.CheckRedirect,
} })(c)
return client.WithHTTPClient(httpClient)(c)
} }
} }