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

Update containers/storage and containers/image

Browse source 
Update the versions of containers/storage and containers/image, and add
new dependencies that they pull in.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2016-11-22 14:32:10 -05:00
parent f893e38d6d
commit 9b88295f69
458 changed files with 45347 additions and 726 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/image_pull.go
View file

@ -35,11 +35,15 @@ func (s *Server) PullImage(ctx context.Context, req *pb.PullImageRequest) (*pb.P
if err != nil {
return nil, err
}
i := image.FromSource(src)
blobs, err := i.BlobDigests()
i, err := image.FromSource(src)
if err != nil {
return nil, err
}
blobs := i.LayerInfos()
config := i.ConfigInfo()
if config.Digest != "" {
blobs = append(blobs, config)
}
if err = os.Mkdir(filepath.Join(s.config.ImageDir, tr.StringWithinTransport()), 0755); err != nil {
return nil, err
@ -61,7 +65,7 @@ func (s *Server) PullImage(ctx context.Context, req *pb.PullImageRequest) (*pb.P
if err != nil {
return nil, err
}
if _, _, err = dest.PutBlob(r, b, -1); err != nil {
if _, err = dest.PutBlob(r, b); err != nil {
r.Close()
return nil, err
}