diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-12-11 10:42:36 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 10:42:36 -0600 |
| commit | 7e179b6ddb7b70c48a750bf1b4afefbe5c8e72cc (patch) | |
| tree | caa31853392de5387944acd0dbf2c8be9cfd27c8 /libpod | |
| parent | 0e328de08dc6e17b4cc45b1bf47f2deddb3fef6d (diff) | |
| parent | eaf4d6c8c25eb433158f92b2daf6e9bd60d28703 (diff) | |
| download | podman-7e179b6ddb7b70c48a750bf1b4afefbe5c8e72cc.tar.gz podman-7e179b6ddb7b70c48a750bf1b4afefbe5c8e72cc.tar.bz2 podman-7e179b6ddb7b70c48a750bf1b4afefbe5c8e72cc.zip | |
Merge pull request #115 from umohnani8/containers
Vendor in latest upstream containers/image
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/images/image_data.go | 1 | ||||
| -rw-r--r-- | libpod/runtime_img.go | 5 |
2 files changed, 2 insertions, 4 deletions
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) } |