dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-08-02 22:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix dropped pull progress output due to canceled context

Browse Source 
fixes #2248

Signed-off-by: coryb <cbennett@netflix.com>
This commit is contained in:
coryb
2021-07-14 09:08:28 -07:00
parent 699121c00a
commit de0019bf35
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/containerimage/pull.go
View File

@@ -173,6 +173,10 @@ func mainManifestKey(ctx context.Context, desc specs.Descriptor, platform specs.
func (p *puller) CacheKey(ctx context.Context, g session.Group, index int) (cacheKey string, cacheOpts solver.CacheOpts, cacheDone bool, err error) {
p.Puller.Resolver = resolver.DefaultPool.GetResolver(p.RegistryHosts, p.Ref, "pull", p.SessionManager, g).WithImageStore(p.ImageStore, p.id.ResolveMode)
// progressFactory needs the outer context, the context in `p.g.Do` will
// be canceled before the progress output is complete
progressFactory := progress.FromContext(ctx)
_, err = p.g.Do(ctx, "", func(ctx context.Context) (_ interface{}, err error) {
if p.cacheKeyErr != nil || p.cacheKeyDone == true {
return nil, p.cacheKeyErr
@@ -201,7 +205,7 @@ func (p *puller) CacheKey(ctx context.Context, g session.Group, index int) (cach
if len(p.manifest.Descriptors) > 0 {
progressController := &controller.Controller{
WriterFactory: progress.FromContext(ctx),
WriterFactory: progressFactory,
}
if p.vtx != nil {
progressController.Digest = p.vtx.Digest()