dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-06-30 19:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5597 from bpaquet/fix_5584

Browse Source 
[s3 cache] Fix upload of downloaded layer
This commit is contained in:
Tõnis Tiigi
2025-02-10 16:55:09 -08:00
committed by GitHub
parent 0e3037c018 914c553703
commit c4f673e5b9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cache/remotecache/s3/s3.go vendored
View File

@@ -454,11 +454,14 @@ func (s3Client *s3Client) getManifest(ctx context.Context, key string, config *v
return true, nil
}
func (s3Client *s3Client) getReader(ctx context.Context, key string) (io.ReadCloser, error) {
func (s3Client *s3Client) getReader(ctx context.Context, key string, offset int64) (io.ReadCloser, error) {
input := &s3.GetObjectInput{
Bucket: &s3Client.bucket,
Key: &key,
}
if offset > 0 {
input.Range = aws.String(fmt.Sprintf("bytes=%d-", offset))
}
output, err := s3Client.GetObject(ctx, input)
if err != nil {
@@ -588,7 +591,7 @@ func (s3Client *s3Client) touch(ctx context.Context, key string, size *int64) (e
func (s3Client *s3Client) ReaderAt(ctx context.Context, desc ocispecs.Descriptor) (content.ReaderAt, error) {
readerAtCloser := toReaderAtCloser(func(offset int64) (io.ReadCloser, error) {
return s3Client.getReader(ctx, s3Client.blobKey(desc.Digest))
return s3Client.getReader(ctx, s3Client.blobKey(desc.Digest), offset)
})
return &readerAt{ReaderAtCloser: readerAtCloser, size: desc.Size}, nil
}