diff options
author | umohnani8 <umohnani@redhat.com> | 2018-08-23 14:44:38 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-23 19:11:09 +0000 |
commit | 16465007d0ea1226b63efccc98f1adc8dc279fd3 (patch) | |
tree | 3d902d4406008f9fa9cebc871ce256a95763b09d /vendor/github.com/projectatomic/buildah/new.go | |
parent | 4c00dc66dfacc214d6fff845b73a4fc4226b6747 (diff) | |
download | podman-16465007d0ea1226b63efccc98f1adc8dc279fd3.tar.gz podman-16465007d0ea1226b63efccc98f1adc8dc279fd3.tar.bz2 podman-16465007d0ea1226b63efccc98f1adc8dc279fd3.zip |
Vendor in latest projectatomic/buildah
Fixes to podman build for unknown image and ADD with url
when doing --layers.
Signed-off-by: umohnani8 <umohnani@redhat.com>
Closes: #1330
Approved by: mheon
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/new.go')
-rw-r--r-- | vendor/github.com/projectatomic/buildah/new.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vendor/github.com/projectatomic/buildah/new.go b/vendor/github.com/projectatomic/buildah/new.go index 1895bae48..773e65427 100644 --- a/vendor/github.com/projectatomic/buildah/new.go +++ b/vendor/github.com/projectatomic/buildah/new.go @@ -140,7 +140,11 @@ func newContainerIDMappingOptions(idmapOptions *IDMappingOptions) storage.IDMapp func resolveImage(ctx context.Context, systemContext *types.SystemContext, store storage.Store, options BuilderOptions) (types.ImageReference, *storage.Image, error) { var ref types.ImageReference var img *storage.Image - for _, image := range util.ResolveName(options.FromImage, options.Registry, systemContext, store) { + images, err := util.ResolveName(options.FromImage, options.Registry, systemContext, store) + if err != nil { + return nil, nil, errors.Wrapf(err, "error parsing reference to image %q", options.FromImage) + } + for _, image := range images { var err error if len(image) >= minimumTruncatedIDLength { if img, err = store.Image(image); err == nil && img != nil && strings.HasPrefix(img.ID, image) { |