Bump moby/buildkit

Signed-off-by: ulyssessouza <ulyssessouza@gmail.com>
This commit is contained in:
ulyssessouza
2019-12-11 14:13:56 +01:00
parent 3d630c6f7f
commit 3ff9abca3a
252 changed files with 23414 additions and 7187 deletions

View File

@ -15,6 +15,7 @@ import (
)
// A Dialer is a means to establish a connection.
// Custom dialers should also implement ContextDialer.
type Dialer interface {
// Dial connects to the given address via the proxy.
Dial(network, addr string) (c net.Conn, err error)
@ -25,21 +26,30 @@ type Auth struct {
User, Password string
}
// FromEnvironment returns the dialer specified by the proxy related variables in
// the environment.
// FromEnvironment returns the dialer specified by the proxy-related
// variables in the environment and makes underlying connections
// directly.
func FromEnvironment() Dialer {
return FromEnvironmentUsing(Direct)
}
// FromEnvironmentUsing returns the dialer specify by the proxy-related
// variables in the environment and makes underlying connections
// using the provided forwarding Dialer (for instance, a *net.Dialer
// with desired configuration).
func FromEnvironmentUsing(forward Dialer) Dialer {
allProxy := allProxyEnv.Get()
if len(allProxy) == 0 {
return Direct
return forward
}
proxyURL, err := url.Parse(allProxy)
if err != nil {
return Direct
return forward
}
proxy, err := FromURL(proxyURL, Direct)
proxy, err := FromURL(proxyURL, forward)
if err != nil {
return Direct
return forward
}
noProxy := noProxyEnv.Get()
@ -47,7 +57,7 @@ func FromEnvironment() Dialer {
return proxy
}
perHost := NewPerHost(proxy, Direct)
perHost := NewPerHost(proxy, forward)
perHost.AddFromString(noProxy)
return perHost
}