Browse code

builder: fix private pulls on buildkit

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Tonis Tiigi authored on 2018/10/18 09:45:44
Showing 1 changed files
... ...
@@ -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
 }