Przeglądaj źródła

c8d: The authorizer needs to be set even if AuthConfig is empty

Without the authorizer pulling will fail if the user is not logged-in

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
Djordje Lukic 2 lat temu
rodzic
commit
348a79958d
1 zmienionych plików z 1 dodań i 4 usunięć
  1. 1 4
      daemon/containerd/resolver.go

+ 1 - 4
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 {
 func hostsWrapper(hostsFn docker.RegistryHosts, optAuthConfig *registrytypes.AuthConfig, regService RegistryConfigProvider) docker.RegistryHosts {
 	var authorizer docker.Authorizer
 	var authorizer docker.Authorizer
 	if optAuthConfig != nil {
 	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) {
 	return func(n string) ([]docker.RegistryHost, error) {