Merge component 'engine' from git@github.com:docker/engine 18.09

2018-10-18 21:03:44 +00:00
parent 648ce8a093 72eaf55d91
commit 6e881228a8
1 changed files with 2 additions and 2 deletions
@@ -75,12 +75,12 @@ func (is *imageSource) ID() string {

 func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {
 	opt := docker.ResolverOptions{
-		Client:      tracing.DefaultClient,
-		Credentials: is.getCredentialsFromSession(ctx),
+		Client: tracing.DefaultClient,
 	}
 	if rfn != nil {
 		opt = rfn(ref)
 	}
+	opt.Credentials = is.getCredentialsFromSession(ctx)
 	r := docker.NewResolver(opt)
 	return r
 }