builder: fix private pulls on buildkit

tonistiigi · tonistiigi · commit c693d45acf74 · 2018-10-17T17:45:44.000-07:00
Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go
@@ -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
 }

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,12 @@ func (is *imageSource) ID() string {`
`75`	`75`
`76`	`76`	`func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {`
`77`	`77`	`opt := docker.ResolverOptions{`
`78`		`- Client: tracing.DefaultClient,`
`79`		`- Credentials: is.getCredentialsFromSession(ctx),`
	`78`	`+ Client: tracing.DefaultClient,`
`80`	`79`	`}`
`81`	`80`	`if rfn != nil {`
`82`	`81`	`opt = rfn(ref)`
`83`	`82`	`}`
	`83`	`+ opt.Credentials = is.getCredentialsFromSession(ctx)`
`84`	`84`	`r := docker.NewResolver(opt)`
`85`	`85`	`return r`
`86`	`86`	`}`