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

Merge pull request #1861 from jessvalarezo/images-err-2

Browse Source 
update images error (pt. 2)
This commit is contained in:
Michael Crosby 2017-12-01 18:53:43 -05:00 committed by GitHub
commit 026bf2902a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image.go
View File

@ -147,7 +147,7 @@ func (i *image) getLayers(ctx context.Context, platform string) ([]rootfs.Layer,
manifest, err := images.Manifest(ctx, cs, i.i.Target, platform) manifest, err := images.Manifest(ctx, cs, i.i.Target, platform)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "") return nil, err
} }
diffIDs, err := i.i.RootFS(ctx, cs, platform) diffIDs, err := i.i.RootFS(ctx, cs, platform)

2
images/image.go
View File

@ -187,7 +187,7 @@ func Manifest(ctx context.Context, provider content.Provider, image ocispec.Desc
return descs, nil return descs, nil
} }
return nil, errors.Wrapf(errdefs.ErrNotFound, "could not resolve manifest %v", desc.Digest) return nil, errors.Wrapf(errdefs.ErrNotFound, "unexpected media type %v for %v", desc.MediaType, desc.Digest)
}), image); err != nil { }), image); err != nil {
return ocispec.Manifest{}, err return ocispec.Manifest{}, err
} }