Merge pull request #3630 from AkihiroSuda/ctr-newdockerauthorized

crosbymichael · web-flow · commit 51671ef734ab · 2019-09-09T12:47:10.000-04:00
ctr: use NewDockerAuthorizer instead of deprecated NewAuthorizer
diff --git a/cmd/ctr/commands/resolver.go b/cmd/ctr/commands/resolver.go
@@ -103,7 +103,8 @@ func GetResolver(ctx gocontext.Context, clicontext *cli.Context) (remotes.Resolv
 		// Only one host
 		return username, secret, nil
 	}
-	options.Authorizer = docker.NewAuthorizer(options.Client, credentials)
+	authOpts := []docker.AuthorizerOpt{docker.WithAuthClient(options.Client), docker.WithAuthCreds(credentials)}
+	options.Authorizer = docker.NewDockerAuthorizer(authOpts...)
 
 	return docker.NewResolver(options), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,8 @@ func GetResolver(ctx gocontext.Context, clicontext *cli.Context) (remotes.Resolv`
`103`	`103`	`// Only one host`
`104`	`104`	`return username, secret, nil`
`105`	`105`	`}`
`106`		`- options.Authorizer = docker.NewAuthorizer(options.Client, credentials)`
	`106`	`+ authOpts := []docker.AuthorizerOpt{docker.WithAuthClient(options.Client), docker.WithAuthCreds(credentials)}`
	`107`	`+ options.Authorizer = docker.NewDockerAuthorizer(authOpts...)`
`107`	`108`
`108`	`109`	`return docker.NewResolver(options), nil`
`109`	`110`	`}`