github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-09-13 21:40:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #579 from runcom/v0134

Browse Source 
release v0.1.34
This commit is contained in:
Antonio Murdaca
2018-12-21 16:10:05 +01:00
committed by GitHub
parent 05212df1c5 0658bc80f3
commit 3e98377bf2
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@@ -1,7 +1,7 @@
github.com/urfave/cli v1.20.0 github.com/urfave/cli v1.20.0
github.com/kr/pretty v0.1.0 github.com/kr/pretty v0.1.0
github.com/kr/text v0.1.0 github.com/kr/text v0.1.0
github.com/containers/image 50e5e55e46a391df8fce1291b2337f1af879b822 github.com/containers/image f0cbc16b444d729362c78244c715b45bf4019b71
golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7 github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
gopkg.in/cheggaaa/pb.v1 v1.0.27 gopkg.in/cheggaaa/pb.v1 v1.0.27

8
vendor/github.com/containers/image/copy/copy.go generated vendored
View File

@@ -395,12 +395,13 @@ func shortDigest(d digest.Digest) string {
} }
// createProgressBar creates a pb.ProgressBar. // 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 := pb.New(int(srcInfo.Size)).SetUnits(pb.U_BYTES)
bar.SetMaxWidth(80) bar.SetMaxWidth(80)
bar.ShowTimeLeft = false bar.ShowTimeLeft = false
bar.ShowPercent = false bar.ShowPercent = false
bar.Prefix(fmt.Sprintf("Copying %s %s:", kind, shortDigest(srcInfo.Digest))) bar.Prefix(fmt.Sprintf("Copying %s %s:", kind, shortDigest(srcInfo.Digest)))
bar.Output = writer
return bar return bar
} }
@@ -468,11 +469,12 @@ func (ic *imageCopier) copyLayers(ctx context.Context) error {
progressBars := make([]*pb.ProgressBar, numLayers) progressBars := make([]*pb.ProgressBar, numLayers)
for i, srcInfo := range srcInfos { for i, srcInfo := range srcInfos {
bar := createProgressBar(srcInfo, "blob") bar := createProgressBar(srcInfo, "blob", nil)
progressBars[i] = bar progressBars[i] = bar
} }
progressPool := pb.NewPool(progressBars...) progressPool := pb.NewPool(progressBars...)
progressPool.Output = ic.c.reportWriter
if err := progressPool.Start(); err != nil { if err := progressPool.Start(); err != nil {
return errors.Wrapf(err, "error creating progress-bar pool") 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 { if err != nil {
return errors.Wrapf(err, "Error reading config blob %s", srcInfo.Digest) return errors.Wrapf(err, "Error reading config blob %s", srcInfo.Digest)
} }
bar := createProgressBar(srcInfo, "config") bar := createProgressBar(srcInfo, "config", c.reportWriter)
defer bar.Finish() defer bar.Finish()
bar.Start() bar.Start()
destInfo, err := c.copyBlobFromStream(ctx, bytes.NewReader(configBlob), srcInfo, nil, false, true, bar) 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
View File

@@ -113,7 +113,7 @@ func (c *sizeCounter) Write(p []byte) (n int, err error) {
// HasThreadSafePutBlob indicates whether PutBlob can be executed concurrently. // HasThreadSafePutBlob indicates whether PutBlob can be executed concurrently.
func (d *dockerImageDestination) HasThreadSafePutBlob() bool { 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). // 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
View File

@@ -331,7 +331,7 @@ func (s *storageImageDestination) computeNextBlobCacheFile() string {
} }
// HasThreadSafePutBlob indicates whether PutBlob can be executed concurrently. // HasThreadSafePutBlob indicates whether PutBlob can be executed concurrently.
func (d *storageImageDestination) HasThreadSafePutBlob() bool { func (s *storageImageDestination) HasThreadSafePutBlob() bool {
return true return true
} }

2
vendor/github.com/containers/image/tarball/tarball_src.go generated vendored
View File

@@ -207,7 +207,7 @@ func (is *tarballImageSource) Close() error {
} }
// HasThreadSafeGetBlob indicates whether GetBlob can be executed concurrently. // HasThreadSafeGetBlob indicates whether GetBlob can be executed concurrently.
func (s *tarballImageSource) HasThreadSafeGetBlob() bool { func (is *tarballImageSource) HasThreadSafeGetBlob() bool {
return false return false
} }

2
version/version.go
View File

@@ -1,4 +1,4 @@
package version package version
// Version is the version of the build. // Version is the version of the build.
const Version = "0.1.34-dev" const Version = "0.1.35-dev"