diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-14 22:25:08 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-09-15 10:58:55 +0000 |
commit | 5e4f7e915ebec279f20329bba5701a7b8d8dfe32 (patch) | |
tree | 92cd8bbf3ed49cca9cf8b46322bfe57848bd39c4 /vendor/github.com/projectatomic/buildah/pull.go | |
parent | 70189f0223cc01a2949cea436e06f3aee316d0db (diff) | |
download | podman-5e4f7e915ebec279f20329bba5701a7b8d8dfe32.tar.gz podman-5e4f7e915ebec279f20329bba5701a7b8d8dfe32.tar.bz2 podman-5e4f7e915ebec279f20329bba5701a7b8d8dfe32.zip |
Vendor in latest projectatomic/buildah
Buildah
Fixes to COPY and ADD to properly follow symbolic links is SRC is a symbolic link
Print out a digest message on successful push.
We should not drop the Bounding set when running as a non priv user in podman build
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1483
Approved by: rhatdan
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/pull.go')
-rw-r--r-- | vendor/github.com/projectatomic/buildah/pull.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vendor/github.com/projectatomic/buildah/pull.go b/vendor/github.com/projectatomic/buildah/pull.go index 48d7f76ed..1d2bb7f87 100644 --- a/vendor/github.com/projectatomic/buildah/pull.go +++ b/vendor/github.com/projectatomic/buildah/pull.go @@ -190,8 +190,8 @@ func pullImage(ctx context.Context, store storage.Store, imageName string, optio }() logrus.Debugf("copying %q to %q", spec, destName) - err = cp.Image(ctx, policyContext, destRef, srcRef, getCopyOptions(options.ReportWriter, sc, nil, "")) - if err == nil { + pullError := cp.Image(ctx, policyContext, destRef, srcRef, getCopyOptions(options.ReportWriter, sc, nil, "")) + if pullError == nil { return destRef, nil } @@ -206,9 +206,9 @@ func pullImage(ctx context.Context, store storage.Store, imageName string, optio return nil, err } if !hasRegistryInName && len(searchRegistries) == 0 { - return nil, errors.Errorf("image name provided is a short name and no search registries are defined in %s.", registryPath) + return nil, errors.Errorf("image name provided is a short name and no search registries are defined in %s: %s", registryPath, pullError) } - return nil, errors.Errorf("unable to find image in the registries defined in %q", registryPath) + return nil, pullError } // getImageDigest creates an image object and uses the hex value of the digest as the image ID |