github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2690 from dmcgowan/resolver-updates

Browse Source 
Update Docker resolver to pass in Authorizer interface
This commit is contained in:
Phil Estes
2018-10-03 09:58:42 +02:00
committed by GitHub
parent 90b7b88e10 a6198b7692
commit 43acab8100
4 changed files with 395 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/ctr/commands/resolver.go
View File

@@ -79,11 +79,6 @@ func GetResolver(ctx gocontext.Context, clicontext *cli.Context) (remotes.Resolv
secret = rt
}
options.Credentials = func(host string) (string, string, error) {
// Only one host
return username, secret, nil
}
tr := &http.Transport{
Proxy: http.ProxyFromEnvironment,
DialContext: (&net.Dialer{
@@ -104,5 +99,11 @@ func GetResolver(ctx gocontext.Context, clicontext *cli.Context) (remotes.Resolv
Transport: tr,
}
credentials := func(host string) (string, string, error) {
// Only one host
return username, secret, nil
}
options.Authorizer = docker.NewAuthorizer(options.Client, credentials)
return docker.NewResolver(options), nil
}