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

Merge pull request #1319 from dhiltgen/fix_progress_master 

Fix progress reporting for containerd pulls
This commit is contained in:
Sebastiaan van Stijn 2018-08-29 12:58:37 +02:00 committed by GitHub
parent dbdd4d7052 03924bc439
commit ead40ca6b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
} }