diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-07 01:00:07 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-07 17:14:02 +0000 |
| commit | cf7c8295b8875ddd4fe87a4207aa302efbd90b18 (patch) | |
| tree | f9358349d4574e469b72db2208a57c0f5160da91 /vendor/github.com/projectatomic/buildah/new.go | |
| parent | 7d6e717dd9f8fe367b64839089db859ca6bd8a83 (diff) | |
| download | podman-cf7c8295b8875ddd4fe87a4207aa302efbd90b18.tar.gz podman-cf7c8295b8875ddd4fe87a4207aa302efbd90b18.tar.bz2 podman-cf7c8295b8875ddd4fe87a4207aa302efbd90b18.zip | |
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 <dwalsh@redhat.com>
Closes: #917
Approved by: rhatdan
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/new.go')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/new.go | 4 |
1 files changed, 2 insertions, 2 deletions
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 |