toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1311 from dhiltgen/fix_progress

Browse Source 
[18.09] Fix progress reporting for containerd pulls
Upstream-commit: b75350de7a
Component: cli
This commit is contained in:
Andrew Hsu
2018-08-28 14:59:59 -07:00
committed by GitHub
parent 72ee90b9b2 64587cac6e
commit 80cd126e9a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/cli/internal/containerizedengine/progress.go
View File

@ -64,7 +64,7 @@ outer:
}
}
err := updateNonActive(ctx, ongoing, cs, statuses, keys, activeSeen, &done, start)
err := updateNonActive(ctx, ongoing, cs, statuses, &keys, activeSeen, &done, start)
if err != nil {
continue outer
}
@ -92,11 +92,11 @@ outer:
}
}
func updateNonActive(ctx context.Context, ongoing *jobs, cs content.Store, statuses map[string]statusInfo, keys []string, activeSeen map[string]struct{}, done *bool, start time.Time) error {
func updateNonActive(ctx context.Context, ongoing *jobs, cs content.Store, statuses map[string]statusInfo, keys *[]string, activeSeen map[string]struct{}, done *bool, start time.Time) error {
for _, j := range ongoing.jobs() {
key := remotes.MakeRefKey(ctx, j)
keys = append(keys, key)
*keys = append(*keys, key)
if _, ok := activeSeen[key]; ok {
continue
}