From 88cbe506988502be62aacbfe5a22d2ad407f67e7 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 13 May 2019 17:01:13 -0700 Subject: [PATCH] builder-next: call stopprogress on download error Signed-off-by: Tonis Tiigi (cherry picked from commit 91a57f3e7f5ed569f7b9d97d14de11bb324bb8e0) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 77e30108bda9e3369edf33737d8b57c20594ec64 Component: engine --- .../engine/builder/builder-next/adapters/containerimage/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/builder/builder-next/adapters/containerimage/pull.go b/components/engine/builder/builder-next/adapters/containerimage/pull.go index b1e44d95e9..bb01b291b7 100644 --- a/components/engine/builder/builder-next/adapters/containerimage/pull.go +++ b/components/engine/builder/builder-next/adapters/containerimage/pull.go @@ -515,10 +515,10 @@ func (p *puller) Snapshot(ctx context.Context) (cache.ImmutableRef, error) { r := image.NewRootFS() rootFS, release, err := p.is.DownloadManager.Download(ctx, *r, runtime.GOOS, layers, pkgprogress.ChanOutput(pchan)) + stopProgress() if err != nil { return nil, err } - stopProgress() ref, err := p.is.CacheAccessor.GetFromSnapshotter(ctx, string(rootFS.ChainID()), cache.WithDescription(fmt.Sprintf("pulled from %s", p.ref))) release()