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

switch to client provided services and address nits

Browse Source 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown
2017-06-20 13:13:12 -05:00
parent 0fe8c17fdf
commit 97063a0e34
19 changed files with 261 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/server/helpers.go
View File

@@ -346,21 +346,21 @@ func (c *criContainerdService) localResolve(ctx context.Context, ref string) (*m
_, err := imagedigest.Parse(ref)
if err != nil {
// ref is not image id, try to resolve it locally.
normalized, nerr := normalizeImageRef(ref)
normalized, err := normalizeImageRef(ref)
if err != nil {
return nil, fmt.Errorf("invalid image reference %q: %v", ref, nerr)
return nil, fmt.Errorf("invalid image reference %q: %v", ref, err)
}
image, gerr := c.imageStoreService.Get(ctx, normalized.String())
if gerr != nil {
if containerdmetadata.IsNotFound(gerr) {
image, err := c.imageStoreService.Get(ctx, normalized.String())
if err != nil {
if containerdmetadata.IsNotFound(err) {
return nil, nil
}
return nil, fmt.Errorf("an error occurred when getting image %q from containerd image store: %v",
normalized.String(), gerr)
normalized.String(), err)
}
desc, cerr := image.Config(ctx, c.contentStoreService)
if cerr != nil {
return nil, fmt.Errorf("failed to get image config descriptor: %v", cerr)
desc, err := image.Config(ctx, c.contentStoreService)
if err != nil {
return nil, fmt.Errorf("failed to get image config descriptor: %v", err)
}
ref = desc.Digest.String()
}