From cf7c8295b8875ddd4fe87a4207aa302efbd90b18 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 7 Jun 2018 01:00:07 -0400 Subject: Vendor in latest buildah code Use the parsing code to properly setup podman build namespaces Fixes support for network namespace and user namespace Signed-off-by: Daniel J Walsh Closes: #917 Approved by: rhatdan --- vendor/github.com/projectatomic/buildah/new.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (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 d6aa21f8e..da170d591 100644 --- a/vendor/github.com/projectatomic/buildah/new.go +++ b/vendor/github.com/projectatomic/buildah/new.go @@ -168,7 +168,7 @@ func resolveImage(ctx context.Context, systemContext *types.SystemContext, store if options.PullPolicy == PullAlways { pulledImg, pulledReference, err := pullAndFindImage(ctx, store, image, options, systemContext) if err != nil { - logrus.Debugf("error pulling and reading image %q: %v", image, err) + logrus.Debugf("unable to pull and read image %q: %v", image, err) continue } ref = pulledReference @@ -214,7 +214,7 @@ func resolveImage(ctx context.Context, systemContext *types.SystemContext, store } pulledImg, pulledReference, err := pullAndFindImage(ctx, store, image, options, systemContext) if err != nil { - logrus.Debugf("error pulling and reading image %q: %v", image, err) + logrus.Debugf("unable to pull and read image %q: %v", image, err) continue } ref = pulledReference -- cgit v1.2.3-54-g00ecf