From b68a9f68b6bb9f3234ffd05d108b53fb085563b8 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 23 May 2024 15:09:49 +0000 Subject: [PATCH] Print current and total layers --- pkg/util/fs_util.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go index 6d5fc33c50..e968d62e8e 100644 --- a/pkg/util/fs_util.go +++ b/pkg/util/fs_util.go @@ -193,14 +193,14 @@ func GetFSFromLayers(root string, layers []v1.Layer, opts ...FSOpt) ([]string, e var extractedBytes int64 for i, l := range layers { if mediaType, err := l.MediaType(); err == nil { - logrus.Tracef("Extracting layer %d of media type %s", i, mediaType) + logrus.Tracef("Extracting layer %d/%d of media type %s", i+1, len(layers), mediaType) } else { - logrus.Tracef("Extracting layer %d", i) + logrus.Tracef("Extracting layer %d/%d", i+1, len(layers)) } progressPerc := float64(extractedBytes) / float64(totalSize) * 100 if printExtractionProgress { - logrus.Infof("Extracting layer %d (%.1f%%)", i, progressPerc) + logrus.Infof("Extracting layer %d/%d (%.1f%%)", i+1, len(layers), progressPerc) } r, err := l.Uncompressed() @@ -214,7 +214,7 @@ func GetFSFromLayers(root string, layers []v1.Layer, opts ...FSOpt) ([]string, e ReadCloser: r, after: time.Second, print: func(n int) { - logrus.Infof("Extracting layer %d (%.1f%%) %s", i, progressPerc, strings.Repeat(".", n)) + logrus.Infof("Extracting layer %d/%d (%.1f%%) %s", i+1, len(layers), progressPerc, strings.Repeat(".", n)) }, } }