github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Transfer: Push: fix failure on pushing duplicated blobs

Browse Source 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
This commit is contained in:
Kohei Tokunaga 2024-05-31 18:08:45 +09:00
parent 21c244d436
commit 0e8cc91463
No known key found for this signature in database
GPG Key ID: 6CE0A04690DB3FB3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/transfer/local/push.go
View File

@ -158,7 +158,13 @@ func (p *progressPusher) WrapHandler(h images.Handler) images.Handler {
func (p *progressPusher) Push(ctx context.Context, d ocispec.Descriptor) (content.Writer, error) { func (p *progressPusher) Push(ctx context.Context, d ocispec.Descriptor) (content.Writer, error) {
ref := remotes.MakeRefKey(ctx, d) ref := remotes.MakeRefKey(ctx, d)
p.status.add(ref, d) p.status.add(ref, d)
cw, err := p.Pusher.Push(ctx, d) var cw content.Writer
var err error
if cs, ok := p.Pusher.(content.Ingester); ok {
cw, err = content.OpenWriter(ctx, cs, content.WithRef(ref), content.WithDescriptor(d))
} else {
cw, err = p.Pusher.Push(ctx, d)
}
if err != nil { if err != nil {
if errdefs.IsAlreadyExists(err) { if errdefs.IsAlreadyExists(err) {
p.progress.MarkExists(d) p.progress.MarkExists(d)