|
@@ -11,7 +11,6 @@ import (
|
|
"github.com/containerd/containerd/remotes/docker"
|
|
"github.com/containerd/containerd/remotes/docker"
|
|
"github.com/containerd/containerd/version"
|
|
"github.com/containerd/containerd/version"
|
|
"github.com/containerd/log"
|
|
"github.com/containerd/log"
|
|
- "github.com/docker/distribution/registry/client/auth"
|
|
|
|
registrytypes "github.com/docker/docker/api/types/registry"
|
|
registrytypes "github.com/docker/docker/api/types/registry"
|
|
"github.com/docker/docker/dockerversion"
|
|
"github.com/docker/docker/dockerversion"
|
|
"github.com/docker/docker/pkg/useragent"
|
|
"github.com/docker/docker/pkg/useragent"
|
|
@@ -76,15 +75,11 @@ func authorizerFromAuthConfig(authConfig registrytypes.AuthConfig) docker.Author
|
|
"host": host,
|
|
"host": host,
|
|
"cfgHost": cfgHost,
|
|
"cfgHost": cfgHost,
|
|
}).Warn("Host doesn't match")
|
|
}).Warn("Host doesn't match")
|
|
- return "", "", auth.ErrNoBasicAuthCredentials
|
|
|
|
|
|
+ return "", "", nil
|
|
}
|
|
}
|
|
if authConfig.IdentityToken != "" {
|
|
if authConfig.IdentityToken != "" {
|
|
return "", authConfig.IdentityToken, nil
|
|
return "", authConfig.IdentityToken, nil
|
|
}
|
|
}
|
|
-
|
|
|
|
- if authConfig.Username == "" && authConfig.Password == "" {
|
|
|
|
- return "", "", auth.ErrNoBasicAuthCredentials
|
|
|
|
- }
|
|
|
|
return authConfig.Username, authConfig.Password, nil
|
|
return authConfig.Username, authConfig.Password, nil
|
|
}))
|
|
}))
|
|
}
|
|
}
|