From 5521475b612451fe5805486b813a1d515f90c1e3 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Wed, 17 Oct 2018 17:45:44 -0700 Subject: [PATCH] builder: fix private pulls on buildkit Signed-off-by: Tonis Tiigi (cherry picked from commit c693d45acf74b87680ace0db8615f97bd6853598) Signed-off-by: Tonis Tiigi Upstream-commit: fdaf08a57b2348623f33e0b9855c488421fc7bf6 Component: engine --- .../builder/builder-next/adapters/containerimage/pull.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/builder/builder-next/adapters/containerimage/pull.go b/components/engine/builder/builder-next/adapters/containerimage/pull.go index f94b4ebe9e..f6e55f4b6b 100644 --- a/components/engine/builder/builder-next/adapters/containerimage/pull.go +++ b/components/engine/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 }