Merge pull request moby#3443 from tonistiigi/progress-cancel

tonistiigi · web-flow · commit ba01b5419bc4 · 2023-01-06T00:15:52.000-08:00
progress: fix clean context cancelling
diff --git a/util/pull/pullprogress/progress.go b/util/pull/pullprogress/progress.go
@@ -106,6 +106,8 @@ func trackProgress(ctx context.Context, desc ocispecs.Descriptor, manager PullMa
 		select {
 		case <-ctx.Done():
 			onFinalStatus = true
+			// we need a context for the manager.Status() calls to pass once. after that this function will exit
+			ctx = context.TODO()
 		case <-ticker.C:
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,8 @@ func trackProgress(ctx context.Context, desc ocispecs.Descriptor, manager PullMa`
`106`	`106`	`select {`
`107`	`107`	`case <-ctx.Done():`
`108`	`108`	`onFinalStatus = true`
	`109`	`+ // we need a context for the manager.Status() calls to pass once. after that this function will exit`
	`110`	`+ ctx = context.TODO()`
`109`	`111`	`case <-ticker.C:`
`110`	`112`	`}`
`111`	`113`