Skip to content

Commit 7a65759

Browse files
committed
remove uses of deprecated ResolverOptions.Client
`NewResolver` calls `NewDockerAuthorizer` and `ConfigureDefaultRegistries`, both of which set the client if none is set; https://github.com/containerd/containerd/blob/dd5e9f653813b3177c3b70ea03e20aaed397e1f9/remotes/docker/authorizer.go#L91-L99 https://github.com/containerd/containerd/blob/dd5e9f653813b3177c3b70ea03e20aaed397e1f9/remotes/docker/registry.go#L156-L174 Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 2ff0d2a commit 7a65759

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

client/llb/imagemetaresolver/resolver.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ func New(with ...ImageMetaResolverOpt) llb.ImageMetaResolver {
4545
headers.Set("User-Agent", version.UserAgent())
4646
return &imageMetaResolver{
4747
resolver: docker.NewResolver(docker.ResolverOptions{
48-
Client: http.DefaultClient,
4948
Headers: headers,
5049
}),
5150
platform: opts.platform,

util/contentutil/refs.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ func ProviderFromRef(ref string) (ocispecs.Descriptor, content.Provider, error)
2020
headers := http.Header{}
2121
headers.Set("User-Agent", version.UserAgent())
2222
remote := docker.NewResolver(docker.ResolverOptions{
23-
Client: http.DefaultClient,
2423
Headers: headers,
2524
})
2625

@@ -40,7 +39,6 @@ func IngesterFromRef(ref string) (content.Ingester, error) {
4039
headers := http.Header{}
4140
headers.Set("User-Agent", version.UserAgent())
4241
remote := docker.NewResolver(docker.ResolverOptions{
43-
Client: http.DefaultClient,
4442
Headers: headers,
4543
})
4644

0 commit comments

Comments
 (0)