mirror of
https://github.com/containers/podman.git
synced 2025-12-01 10:38:05 +08:00
Vendor in buildah 1.9.2
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
8
vendor/github.com/containers/buildah/pkg/blobcache/blobcache.go
generated
vendored
8
vendor/github.com/containers/buildah/pkg/blobcache/blobcache.go
generated
vendored
@@ -18,7 +18,7 @@ import (
|
||||
"github.com/containers/storage/pkg/archive"
|
||||
"github.com/containers/storage/pkg/ioutils"
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
"github.com/opencontainers/image-spec/specs-go/v1"
|
||||
v1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
@@ -83,7 +83,7 @@ func makeFilename(blobSum digest.Digest, isConfig bool) string {
|
||||
|
||||
// NewBlobCache creates a new blob cache that wraps an image reference. Any blobs which are
|
||||
// written to the destination image created from the resulting reference will also be stored
|
||||
// as-is to the specifed directory or a temporary directory. The cache directory's contents
|
||||
// as-is to the specified directory or a temporary directory. The cache directory's contents
|
||||
// can be cleared by calling the returned BlobCache()'s ClearCache() method.
|
||||
// The compress argument controls whether or not the cache will try to substitute a compressed
|
||||
// or different version of a blob when preparing the list of layers when reading an image.
|
||||
@@ -379,7 +379,9 @@ func saveStream(wg *sync.WaitGroup, decompressReader io.ReadCloser, tempFile *os
|
||||
_, err3 = io.Copy(io.MultiWriter(tempFile, digester.Hash()), decompressed)
|
||||
} else {
|
||||
// Drain the pipe to keep from stalling the PutBlob() thread.
|
||||
io.Copy(ioutil.Discard, decompressReader)
|
||||
if _, err := io.Copy(ioutil.Discard, decompressReader); err != nil {
|
||||
logrus.Debugf("error draining the pipe: %v", err)
|
||||
}
|
||||
}
|
||||
decompressReader.Close()
|
||||
decompressed.Close()
|
||||
|
||||
Reference in New Issue
Block a user