diff --git a/distribution/registry.go b/distribution/registry.go index d81530b75c..2e031847c0 100644 --- a/distribution/registry.go +++ b/distribution/registry.go @@ -16,7 +16,6 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/dockerversion" "github.com/docker/docker/registry" - "github.com/docker/go-connections/sockets" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) @@ -56,7 +55,10 @@ func init() { // NewV2Repository returns a repository (v2 only). It creates an HTTP transport // providing timeout settings and authentication support, and also verifies the // remote API version. -func NewV2Repository(ctx context.Context, repoInfo *registry.RepositoryInfo, endpoint registry.APIEndpoint, metaHeaders http.Header, authConfig *types.AuthConfig, actions ...string) (repo distribution.Repository, foundVersion bool, err error) { +func NewV2Repository( + ctx context.Context, repoInfo *registry.RepositoryInfo, endpoint registry.APIEndpoint, + metaHeaders http.Header, authConfig *types.AuthConfig, actions ...string, +) (repo distribution.Repository, foundVersion bool, err error) { repoName := repoInfo.Name.Name() // If endpoint does not support CanonicalName, use the RemoteName instead if endpoint.TrimHostname { @@ -72,18 +74,13 @@ func NewV2Repository(ctx context.Context, repoInfo *registry.RepositoryInfo, end // TODO(dmcgowan): Call close idle connections when complete, use keep alive base := &http.Transport{ Proxy: http.ProxyFromEnvironment, - Dial: direct.Dial, + DialContext: direct.DialContext, TLSHandshakeTimeout: 10 * time.Second, TLSClientConfig: endpoint.TLSConfig, // TODO(dmcgowan): Call close idle connections when complete and use keep alive DisableKeepAlives: true, } - proxyDialer, err := sockets.DialerFromEnvironment(direct) - if err == nil { - base.Dial = proxyDialer.Dial - } - modifiers := registry.Headers(dockerversion.DockerUserAgent(ctx), metaHeaders) authTransport := transport.NewTransport(base, modifiers...) diff --git a/hack/validate/golangci-lint.yml b/hack/validate/golangci-lint.yml index 972cb361c4..4f66cf2537 100644 --- a/hack/validate/golangci-lint.yml +++ b/hack/validate/golangci-lint.yml @@ -46,10 +46,6 @@ issues: - text: "G202: SQL string concatenation" linters: - gosec - # FIXME temporarily suppress these. See #39925 - - text: "SA1019: base.Dial is deprecated" - linters: - - staticcheck # FIXME temporarily suppress these. See #39928 - text: "SA1019: grpc.WithDialer is deprecated" linters: diff --git a/registry/registry.go b/registry/registry.go index 6727b7dc32..2a914963bd 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -14,7 +14,6 @@ import ( "time" "github.com/docker/distribution/registry/client/transport" - "github.com/docker/go-connections/sockets" "github.com/docker/go-connections/tlsconfig" "github.com/sirupsen/logrus" ) @@ -176,16 +175,12 @@ func NewTransport(tlsConfig *tls.Config) *http.Transport { base := &http.Transport{ Proxy: http.ProxyFromEnvironment, - Dial: direct.Dial, + DialContext: direct.DialContext, TLSHandshakeTimeout: 10 * time.Second, TLSClientConfig: tlsConfig, // TODO(dmcgowan): Call close idle connections when complete and use keep alive DisableKeepAlives: true, } - proxyDialer, err := sockets.DialerFromEnvironment(direct) - if err == nil { - base.Dial = proxyDialer.Dial - } return base }