remove taskService and imageStoreService

Signed-off-by: yason <yan.xuean@zte.com.cn>
This commit is contained in:
yason
2017-12-12 16:40:22 +08:00
parent 41c8763e2b
commit 4762b3e273
6 changed files with 7 additions and 16 deletions

View File

@@ -65,14 +65,14 @@ func (c *criContainerdService) RemoveImage(ctx context.Context, r *runtime.Remov
// Include all image references, including RepoTag, RepoDigest and id.
for _, ref := range append(image.RepoTags, image.RepoDigests...) {
err = c.imageStoreService.Delete(ctx, ref)
err = c.client.ImageService().Delete(ctx, ref)
if err == nil || errdefs.IsNotFound(err) {
continue
}
return nil, fmt.Errorf("failed to delete image reference %q for image %q: %v", ref, image.ID, err)
}
// Delete image id synchronously to trigger garbage collection.
err = c.imageStoreService.Delete(ctx, image.ID, images.SynchronousDelete())
err = c.client.ImageService().Delete(ctx, image.ID, images.SynchronousDelete())
if err != nil && !errdefs.IsNotFound(err) {
return nil, fmt.Errorf("failed to delete image id %q: %v", image.ID, err)
}