Skip to content

Commit 5654350

Browse files
authored
Merge pull request #2844 from giuseppe/update-c-storage-29-apr-2025
vendor: update c/storage
2 parents 0e15562 + 3c26936 commit 5654350

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/BurntSushi/toml v1.5.0
1111
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01
1212
github.com/containers/ocicrypt v1.2.1
13-
github.com/containers/storage v1.58.0
13+
github.com/containers/storage v1.58.1-0.20250507171116-36d562d33cf2
1414
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467
1515
github.com/distribution/reference v0.6.0
1616
github.com/docker/cli v28.1.1+incompatible

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYgle
5656
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
5757
github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=
5858
github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ=
59-
github.com/containers/storage v1.58.0 h1:Q7SyyCCjqgT3wYNgRNIL8o/wUS92heIj2/cc8Sewvcc=
60-
github.com/containers/storage v1.58.0/go.mod h1:w7Jl6oG+OpeLGLzlLyOZPkmUso40kjpzgrHUk5tyBlo=
59+
github.com/containers/storage v1.58.1-0.20250507171116-36d562d33cf2 h1:QdaI7zjSCJPQczO/DKs19Orj1OZ7gltc17lK6iwii2E=
60+
github.com/containers/storage v1.58.1-0.20250507171116-36d562d33cf2/go.mod h1:ha0qrEv1Lk3cVOeOvs7KQyO3ay8prRd7PiyP+RhfHTY=
6161
github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk=
6262
github.com/coreos/go-oidc/v3 v3.14.1/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU=
6363
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 h1:uX1JmpONuD549D73r6cgnxyUu18Zb7yHAy5AYU0Pm4Q=

storage/storage_dest.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,11 @@ func (s *storageImageDestination) PutBlobPartial(ctx context.Context, chunkAcces
421421
}
422422
}()
423423

424-
differ, err := chunked.GetDiffer(ctx, s.imageRef.transport.store, srcInfo.Digest, srcInfo.Size, srcInfo.Annotations, &fetcher)
424+
differ, err := chunked.NewDiffer(ctx, s.imageRef.transport.store, srcInfo.Digest, srcInfo.Size, srcInfo.Annotations, &fetcher)
425425
if err != nil {
426426
return private.UploadedBlob{}, err
427427
}
428+
defer differ.Close()
428429

429430
out, err := s.imageRef.transport.store.PrepareStagedLayer(nil, differ)
430431
if err != nil {

0 commit comments

Comments
 (0)