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

improve calling for content

Browse Source 
Signed-off-by: yason <yan.xuean@zte.com.cn>
This commit is contained in:
yason
2017-12-11 14:19:30 +08:00
parent c89e555150
commit 41c8763e2b
5 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/helpers.go
View File

@@ -315,7 +315,7 @@ type imageInfo struct {
}
// getImageInfo gets image info from containerd.
func getImageInfo(ctx context.Context, image containerd.Image, provider content.Provider) (*imageInfo, error) {
func getImageInfo(ctx context.Context, image containerd.Image) (*imageInfo, error) {
// Get image information.
diffIDs, err := image.RootFS(ctx)
if err != nil {
@@ -334,7 +334,7 @@ func getImageInfo(ctx context.Context, image containerd.Image, provider content.
}
id := desc.Digest.String()
rb, err := content.ReadBlob(ctx, provider, desc.Digest)
rb, err := content.ReadBlob(ctx, image.ContentStore(), desc.Digest)
if err != nil {
return nil, fmt.Errorf("failed to read image config from content store: %v", err)
}