mirror of
https://github.com/containers/skopeo.git
synced 2025-09-17 07:19:37 +00:00
bump(github.com/containers/image)
Signed-off-by: Antonio Murdaca <runcom@linux.com>
This commit is contained in:
8
vendor/github.com/containers/image/copy/copy.go
generated
vendored
8
vendor/github.com/containers/image/copy/copy.go
generated
vendored
@@ -395,12 +395,13 @@ func shortDigest(d digest.Digest) string {
|
||||
}
|
||||
|
||||
// createProgressBar creates a pb.ProgressBar.
|
||||
func createProgressBar(srcInfo types.BlobInfo, kind string) *pb.ProgressBar {
|
||||
func createProgressBar(srcInfo types.BlobInfo, kind string, writer io.Writer) *pb.ProgressBar {
|
||||
bar := pb.New(int(srcInfo.Size)).SetUnits(pb.U_BYTES)
|
||||
bar.SetMaxWidth(80)
|
||||
bar.ShowTimeLeft = false
|
||||
bar.ShowPercent = false
|
||||
bar.Prefix(fmt.Sprintf("Copying %s %s:", kind, shortDigest(srcInfo.Digest)))
|
||||
bar.Output = writer
|
||||
return bar
|
||||
}
|
||||
|
||||
@@ -468,11 +469,12 @@ func (ic *imageCopier) copyLayers(ctx context.Context) error {
|
||||
|
||||
progressBars := make([]*pb.ProgressBar, numLayers)
|
||||
for i, srcInfo := range srcInfos {
|
||||
bar := createProgressBar(srcInfo, "blob")
|
||||
bar := createProgressBar(srcInfo, "blob", nil)
|
||||
progressBars[i] = bar
|
||||
}
|
||||
|
||||
progressPool := pb.NewPool(progressBars...)
|
||||
progressPool.Output = ic.c.reportWriter
|
||||
if err := progressPool.Start(); err != nil {
|
||||
return errors.Wrapf(err, "error creating progress-bar pool")
|
||||
}
|
||||
@@ -566,7 +568,7 @@ func (c *copier) copyConfig(ctx context.Context, src types.Image) error {
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "Error reading config blob %s", srcInfo.Digest)
|
||||
}
|
||||
bar := createProgressBar(srcInfo, "config")
|
||||
bar := createProgressBar(srcInfo, "config", c.reportWriter)
|
||||
defer bar.Finish()
|
||||
bar.Start()
|
||||
destInfo, err := c.copyBlobFromStream(ctx, bytes.NewReader(configBlob), srcInfo, nil, false, true, bar)
|
||||
|
2
vendor/github.com/containers/image/docker/docker_image_dest.go
generated
vendored
2
vendor/github.com/containers/image/docker/docker_image_dest.go
generated
vendored
@@ -113,7 +113,7 @@ func (c *sizeCounter) Write(p []byte) (n int, err error) {
|
||||
|
||||
// HasThreadSafePutBlob indicates whether PutBlob can be executed concurrently.
|
||||
func (d *dockerImageDestination) HasThreadSafePutBlob() bool {
|
||||
return true
|
||||
return false
|
||||
}
|
||||
|
||||
// PutBlob writes contents of stream and returns data representing the result (with all data filled in).
|
||||
|
2
vendor/github.com/containers/image/storage/storage_image.go
generated
vendored
2
vendor/github.com/containers/image/storage/storage_image.go
generated
vendored
@@ -331,7 +331,7 @@ func (s *storageImageDestination) computeNextBlobCacheFile() string {
|
||||
}
|
||||
|
||||
// HasThreadSafePutBlob indicates whether PutBlob can be executed concurrently.
|
||||
func (d *storageImageDestination) HasThreadSafePutBlob() bool {
|
||||
func (s *storageImageDestination) HasThreadSafePutBlob() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
|
2
vendor/github.com/containers/image/tarball/tarball_src.go
generated
vendored
2
vendor/github.com/containers/image/tarball/tarball_src.go
generated
vendored
@@ -207,7 +207,7 @@ func (is *tarballImageSource) Close() error {
|
||||
}
|
||||
|
||||
// HasThreadSafeGetBlob indicates whether GetBlob can be executed concurrently.
|
||||
func (s *tarballImageSource) HasThreadSafeGetBlob() bool {
|
||||
func (is *tarballImageSource) HasThreadSafeGetBlob() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user