diff options
| author | Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> | 2023-05-12 10:48:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-12 10:48:27 +0100 |
| commit | 5d5f2e3a935dac56c3f7a04339496c54ae42d39f (patch) | |
| tree | bdebd0e25a9ce2d0c6bec7a109b9e461ceb157d9 | |
| parent | 9e6370819bf61de7583ea00af13fcbedd2bbbfe7 (diff) | |
| parent | 348a79958daeb79e17409108f8e6fb72c2f940a4 (diff) | |
| download | docker-5d5f2e3a935dac56c3f7a04339496c54ae42d39f.tar.gz | |
Merge pull request #45530 from rumpl/fix-empty-auth-pull
c8d: The authorizer needs to be set even if AuthConfig is empty
| -rw-r--r-- | daemon/containerd/resolver.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/daemon/containerd/resolver.go b/daemon/containerd/resolver.go index 5b2d1dff4c..5edd83181b 100644 --- a/daemon/containerd/resolver.go +++ b/daemon/containerd/resolver.go @@ -27,10 +27,7 @@ func (i *ImageService) newResolverFromAuthConfig(authConfig *registrytypes.AuthC func hostsWrapper(hostsFn docker.RegistryHosts, optAuthConfig *registrytypes.AuthConfig, regService RegistryConfigProvider) docker.RegistryHosts { var authorizer docker.Authorizer if optAuthConfig != nil { - auth := *optAuthConfig - if auth != (registrytypes.AuthConfig{}) { - authorizer = docker.NewDockerAuthorizer(authorizationCredsFromAuthConfig(auth)) - } + authorizer = docker.NewDockerAuthorizer(authorizationCredsFromAuthConfig(*optAuthConfig)) } return func(n string) ([]docker.RegistryHost, error) { |