Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix progress reporting for containerd pulls 

During refactoring of the implementation PR progress reporting
was broken.  This gets the progress reporting back in action.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 7f4c842e8a)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
This commit is contained in:
Daniel Hiltgen 2018-08-27 14:43:40 -07:00
parent 6dbe8ea3a3
commit 03924bc439
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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 { if err != nil {
continue outer 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() { for _, j := range ongoing.jobs() {
key := remotes.MakeRefKey(ctx, j) key := remotes.MakeRefKey(ctx, j)
keys = append(keys, key) *keys = append(*keys, key)
if _, ok := activeSeen[key]; ok { if _, ok := activeSeen[key]; ok {
continue continue
} }