dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-08 17:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50800 from thaJeztah/rm_error_convert

Browse Source 
daemon/containerd: remove convertError utility
This commit is contained in:
Sebastiaan van Stijn
2025-08-25 13:34:09 +02:00
committed by GitHub
parent f5df9eea84 c5e75cc485
commit 531be96bf9
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
daemon/containerd/image.go
View File

@@ -248,11 +248,6 @@ func (i *ImageService) getImageLabelByDigest(ctx context.Context, target digest.
return value, nil
}
func convertError(err error) error {
// TODO: Convert containerd error to Docker error
return err
}
// resolveAllReferences resolves the reference name or ID to an image and returns all the images with
// the same target.
//
@@ -293,7 +288,7 @@ func (i *ImageService) resolveAllReferences(ctx context.Context, refOrID string)
dgst = cimg.Target.Digest
}
} else if !cerrdefs.IsNotFound(err) {
return nil, nil, convertError(err)
return nil, nil, err
} else {
dgst = d.Digest()
}
@@ -305,7 +300,7 @@ func (i *ImageService) resolveAllReferences(ctx context.Context, refOrID string)
}
imgs, err := i.images.List(ctx, filters...)
if err != nil {
return nil, nil, convertError(err)
return nil, nil, err
}
if len(imgs) == 0 {
@@ -347,7 +342,7 @@ func (i *ImageService) resolveAllReferences(ctx context.Context, refOrID string)
cimg, err := i.images.Get(ctx, name)
if err != nil {
if !cerrdefs.IsNotFound(err) {
return nil, nil, convertError(err)
return nil, nil, err
}
// If digest is given, continue looking up for matching targets.
// There will be no exact match found but the caller may attempt