Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors 

Fix registry authorization errors
This commit is contained in:
Tõnis Tiigi 2016-11-10 19:39:28 -08:00 committed by GitHub
parent 148dc157f6 43bcd982cd
commit 795e487513
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
command/image/trust.go
View File

@ -20,6 +20,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/distribution/digest" "github.com/docker/distribution/digest"
"github.com/docker/distribution/registry/client/auth" "github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/auth/challenge"
"github.com/docker/distribution/registry/client/transport" "github.com/docker/distribution/registry/client/transport"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
registrytypes "github.com/docker/docker/api/types/registry" registrytypes "github.com/docker/docker/api/types/registry"
@ -291,7 +292,7 @@ func trustedPull(ctx context.Context, cli *command.DockerCli, repoInfo *registry
} }
fmt.Fprintf(cli.Out(), "Pull (%d of %d): %s%s@%s\n", i+1, len(refs), repoInfo.Name(), displayTag, r.digest) fmt.Fprintf(cli.Out(), "Pull (%d of %d): %s%s@%s\n", i+1, len(refs), repoInfo.Name(), displayTag, r.digest)
ref, err := reference.WithDigest(repoInfo, r.digest) ref, err := reference.WithDigest(reference.TrimNamed(repoInfo), r.digest)
if err != nil { if err != nil {
return err return err
} }
@ -305,7 +306,7 @@ func trustedPull(ctx context.Context, cli *command.DockerCli, repoInfo *registry
if err != nil { if err != nil {
return err return err
} }
trustedRef, err := reference.WithDigest(repoInfo, r.digest) trustedRef, err := reference.WithDigest(reference.TrimNamed(repoInfo), r.digest)
if err != nil { if err != nil {
return err return err
} }
@ -434,7 +435,7 @@ func GetNotaryRepository(streams command.Streams, repoInfo *registry.RepositoryI
return nil, err return nil, err
} }
challengeManager := auth.NewSimpleChallengeManager() challengeManager := challenge.NewSimpleManager()
resp, err := pingClient.Do(req) resp, err := pingClient.Do(req)
if err != nil { if err != nil {
@ -523,7 +524,7 @@ func TrustedReference(ctx context.Context, cli *command.DockerCli, ref reference
} }
return reference.WithDigest(ref, r.digest) return reference.WithDigest(reference.TrimNamed(ref), r.digest)
} }
func convertTarget(t client.Target) (target, error) { func convertTarget(t client.Target) (target, error) {