vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge 75d6dc7558 into 35eea14c66

Browse source
This commit is contained in:
cuihaozhi 2017-08-30 11:53:09 +00:00 • committed by GitHub
commit 3935351d53
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/crioctl/image.go
View file

@ -148,6 +148,9 @@ var removeImageCommand = cli.Command{
// PullImage sends a PullImageRequest to the server, and parses // PullImage sends a PullImageRequest to the server, and parses
// the returned PullImageResponse. // the returned PullImageResponse.
func PullImage(client pb.ImageServiceClient, image string) (*pb.PullImageResponse, error) { func PullImage(client pb.ImageServiceClient, image string) (*pb.PullImageResponse, error) {
if image == "" {
return nil, fmt.Errorf("an image name must be specified")
}
return client.PullImage(context.Background(), &pb.PullImageRequest{Image: &pb.ImageSpec{Image: image}}) return client.PullImage(context.Background(), &pb.PullImageRequest{Image: &pb.ImageSpec{Image: image}})
} }
@ -160,6 +163,9 @@ func ListImages(client pb.ImageServiceClient, image string) (*pb.ListImagesRespo
// ImageStatus sends an ImageStatusRequest to the server, and parses // ImageStatus sends an ImageStatusRequest to the server, and parses
// the returned ImageStatusResponse. // the returned ImageStatusResponse.
func ImageStatus(client pb.ImageServiceClient, image string) (*pb.ImageStatusResponse, error) { func ImageStatus(client pb.ImageServiceClient, image string) (*pb.ImageStatusResponse, error) {
if image == "" {
return nil, fmt.Errorf("ID cannot be empty")
}
return client.ImageStatus(context.Background(), &pb.ImageStatusRequest{Image: &pb.ImageSpec{Image: image}}) return client.ImageStatus(context.Background(), &pb.ImageStatusRequest{Image: &pb.ImageSpec{Image: image}})
} }