From eaf4d6c8c25eb433158f92b2daf6e9bd60d28703 Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Mon, 11 Dec 2017 09:48:55 -0500 Subject: Vendor in latest upstream containers/image Signed-off-by: umohnani8 --- libpod/images/image_data.go | 1 - libpod/runtime_img.go | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'libpod') diff --git a/libpod/images/image_data.go b/libpod/images/image_data.go index b64ac557f..1fa63f6cb 100644 --- a/libpod/images/image_data.go +++ b/libpod/images/image_data.go @@ -88,7 +88,6 @@ func GetData(store storage.Store, name string) (*Data, error) { if err != nil { return nil, errors.Wrapf(err, "error reading image %q", img.ID) } - defer imgRef.Close() tags, digests, err := ParseImageNames(img.Names) if err != nil { diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index ba1cec96f..598bfaf0f 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -228,7 +228,7 @@ func (k *Image) GetManifest() error { if err != nil { return errors.Wrapf(err, "unable to create new image source") } - _, _, err = imageSource.GetManifest() + _, _, err = imageSource.GetManifest(nil) if err == nil { return nil } @@ -383,7 +383,7 @@ func (k *Image) HasLatest() (bool, error) { if err != nil { return false, err } - _, _, err = pullRef.(types.ImageSource).GetManifest() + _, _, err = pullRef.(types.ImageSource).GetManifest(nil) return false, err } @@ -1124,7 +1124,6 @@ func (r *Runtime) InfoAndDigestAndSize(img storage.Image) (*types.ImageInspectIn if err != nil { return nil, "", -1, errors.Wrapf(err, "error reading image %q", img.ID) } - defer imgRef.Close() return infoAndDigestAndSize(imgRef) } -- cgit v1.2.3-54-g00ecf