Skip to content

Commit 273c660

Browse files
authored
Merge pull request #926 from HusterWan/master
bugfix: pull a image failed will lead to list images failed
2 parents ffbbb44 + 1b39ac2 commit 273c660

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

ctrd/image.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,33 @@ func (c *Client) ListImages(ctx context.Context, filter ...string) ([]types.Imag
7878
digest := descriptor.Digest
7979

8080
size, err := image.Size(ctx, c.client.ContentStore(), platforms.Default())
81+
// occur error, skip it
8182
if err != nil {
82-
return nil, err
83+
logrus.Errorf("failed to get image size %s: %v", image.Name, err)
84+
continue
8385
}
8486

8587
refNamed, err := reference.ParseNamedReference(image.Name)
88+
// occur error, skip it
8689
if err != nil {
87-
return nil, err
90+
logrus.Errorf("failed to parse image %s: %v", image.Name, err)
91+
continue
8892
}
8993
refTagged := reference.WithDefaultTagIfMissing(refNamed).(reference.Tagged)
9094

9195
ociImage, err := c.GetOciImage(ctx, image.Name)
96+
// occur error, skip it
9297
if err != nil {
93-
return nil, err
98+
logrus.Errorf("failed to get ociImage %s: %v", image.Name, err)
99+
continue
94100
}
95101

96102
// fill struct ImageInfo
97103
imageInfo, err := ociImageToPouchImage(ociImage)
104+
// occur error, skip it
98105
if err != nil {
99-
return nil, err
106+
logrus.Errorf("failed to convert ociImage to pouch image %s: %v", image.Name, err)
107+
continue
100108
}
101109
imageInfo.Tag = refTagged.Tag()
102110
imageInfo.Name = image.Name

0 commit comments

Comments
 (0)