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/chroot/run.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/chroot/run.go')
-rw-r--r-- | vendor/github.com/projectatomic/buildah/chroot/run.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/github.com/projectatomic/buildah/chroot/run.go b/vendor/github.com/projectatomic/buildah/chroot/run.go index 9a70e0f51..c8aec181a 100644 --- a/vendor/github.com/projectatomic/buildah/chroot/run.go +++ b/vendor/github.com/projectatomic/buildah/chroot/run.go @@ -1075,11 +1075,14 @@ func setupChrootBindMounts(spec *specs.Spec, bundlePath string) (undoBinds func( // The target isn't there yet, so create it, and make a // note to remove it later. if srcinfo.IsDir() { - if err = os.Mkdir(target, 0111); err != nil { + if err = os.MkdirAll(target, 0111); err != nil { return undoBinds, errors.Wrapf(err, "error creating mountpoint %q in mount namespace", target) } removes = append(removes, target) } else { + if err = os.MkdirAll(filepath.Dir(target), 0111); err != nil { + return undoBinds, errors.Wrapf(err, "error ensuring parent of mountpoint %q (%q) is present in mount namespace", target, filepath.Dir(target)) + } var file *os.File if file, err = os.OpenFile(target, os.O_WRONLY|os.O_CREATE, 0); err != nil { return undoBinds, errors.Wrapf(err, "error creating mountpoint %q in mount namespace", target) |