Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: pull a image failed will lead to list images failed #926

Merged
merged 1 commit into from
Mar 20, 2018
Merged

bugfix: pull a image failed will lead to list images failed #926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ctrd/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,25 +78,33 @@ func (c *Client) ListImages(ctx context.Context, filter ...string) ([]types.Imag
digest := descriptor.Digest

size, err := image.Size(ctx, c.client.ContentStore(), platforms.Default())
// occur error, skip it
if err != nil {
return nil, err
logrus.Errorf("failed to get image size %s: %v", image.Name, err)
continue
}

refNamed, err := reference.ParseNamedReference(image.Name)
// occur error, skip it
if err != nil {
return nil, err
logrus.Errorf("failed to parse image %s: %v", image.Name, err)
continue
}
refTagged := reference.WithDefaultTagIfMissing(refNamed).(reference.Tagged)

ociImage, err := c.GetOciImage(ctx, image.Name)
// occur error, skip it
if err != nil {
return nil, err
logrus.Errorf("failed to get ociImage %s: %v", image.Name, err)
continue
}

// fill struct ImageInfo
imageInfo, err := ociImageToPouchImage(ociImage)
// occur error, skip it
if err != nil {
return nil, err
logrus.Errorf("failed to convert ociImage to pouch image %s: %v", image.Name, err)
continue
}
imageInfo.Tag = refTagged.Tag()
imageInfo.Name = image.Name
Expand Down