From 16465007d0ea1226b63efccc98f1adc8dc279fd3 Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Thu, 23 Aug 2018 14:44:38 -0400 Subject: Vendor in latest projectatomic/buildah Fixes to podman build for unknown image and ADD with url when doing --layers. Signed-off-by: umohnani8 Closes: #1330 Approved by: mheon --- vendor/github.com/projectatomic/buildah/new.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'vendor/github.com/projectatomic/buildah/new.go') 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) { -- cgit v1.2.3-54-g00ecf