diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-21 06:45:28 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-09-21 13:35:23 +0000 |
| commit | 2d1b3e6c305edd1d1689d52aa19094b6c95874e1 (patch) | |
| tree | 9c028a40089076b2cb88b271cb056c97af4722a2 | |
| parent | c4b15ce46b1f49404d5b43b9fd50b14ac7fbee60 (diff) | |
| download | podman-2d1b3e6c305edd1d1689d52aa19094b6c95874e1.tar.gz podman-2d1b3e6c305edd1d1689d52aa19094b6c95874e1.tar.bz2 podman-2d1b3e6c305edd1d1689d52aa19094b6c95874e1.zip | |
Vendor in latest containers/buildah
Fixes issues with builtin volumes having correct ownership and permissions
when doing podman builds.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1525
Approved by: giuseppe
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/buildah/README.md | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/buildah/run.go | 11 | ||||
| -rw-r--r-- | vendor/github.com/containers/buildah/vendor.conf | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/vendor.conf b/vendor.conf index 45c9d1956..1f28159cd 100644 --- a/vendor.conf +++ b/vendor.conf @@ -90,7 +90,7 @@ k8s.io/kube-openapi 275e2ce91dec4c05a4094a7b1daee5560b555ac9 https://github.com/ k8s.io/utils 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e https://github.com/kubernetes/utils github.com/mrunalp/fileutils master github.com/varlink/go master -github.com/containers/buildah 19e44f087d5371c86a75bb2ab904c5b98519fa69 +github.com/containers/buildah 53b05ae20fdd801f33cad5e01789898dba31029d github.com/Nvveen/Gotty master github.com/fsouza/go-dockerclient master github.com/openshift/imagebuilder master diff --git a/vendor/github.com/containers/buildah/README.md b/vendor/github.com/containers/buildah/README.md index b04957591..fa4a58fd9 100644 --- a/vendor/github.com/containers/buildah/README.md +++ b/vendor/github.com/containers/buildah/README.md @@ -60,7 +60,7 @@ storage differences, you can not see Podman containers from within Buildah or vi In short Buildah is an efficient way to create OCI images while Podman allows you to manage and maintain those images and containers in a production environment using -familiar container cli commands. For more details, see the +familiar container cli commands. For more details, see the [Container Tools Guide](https://github.com/containers/buildah/tree/master/docs/containertools). ## Example diff --git a/vendor/github.com/containers/buildah/run.go b/vendor/github.com/containers/buildah/run.go index 3d9b909ae..d73f0d239 100644 --- a/vendor/github.com/containers/buildah/run.go +++ b/vendor/github.com/containers/buildah/run.go @@ -506,10 +506,19 @@ func runSetupBuiltinVolumes(mountLabel, mountPoint, containerDir string, copyWit return nil, errors.Wrapf(err, "error relabeling directory %q for volume %q", volumePath, volume) } srcPath := filepath.Join(mountPoint, volume) + stat, err := os.Stat(srcPath) + if err != nil { + return nil, errors.Wrapf(err, "failed to stat %q for volume %q", srcPath, volume) + } + if err = os.Chmod(volumePath, stat.Mode().Perm()); err != nil { + return nil, errors.Wrapf(err, "failed to chmod %q for volume %q", volumePath, volume) + } + if err = os.Chown(volumePath, int(stat.Sys().(*syscall.Stat_t).Uid), int(stat.Sys().(*syscall.Stat_t).Gid)); err != nil { + return nil, errors.Wrapf(err, "error chowning directory %q for volume %q", volumePath, volume) + } if err = copyWithTar(srcPath, volumePath); err != nil && !os.IsNotExist(err) { return nil, errors.Wrapf(err, "error populating directory %q for volume %q using contents of %q", volumePath, volume, srcPath) } - } // Add the bind mount. mounts = append(mounts, specs.Mount{ diff --git a/vendor/github.com/containers/buildah/vendor.conf b/vendor/github.com/containers/buildah/vendor.conf index 0112a2d91..e69c92496 100644 --- a/vendor/github.com/containers/buildah/vendor.conf +++ b/vendor/github.com/containers/buildah/vendor.conf @@ -4,7 +4,7 @@ github.com/BurntSushi/toml master github.com/containerd/continuity master github.com/containernetworking/cni v0.7.0-alpha1 github.com/seccomp/containers-golang master -github.com/containers/image d8b5cf2b804a48489e5203d51254ef576794049d +github.com/containers/image 85d7559d44fd71f30e46e43d809bfbf88d11d916 github.com/containers/storage 243c4cd616afdf06b4a975f18c4db083d26b1641 github.com/docker/distribution 5f6282db7d65e6d72ad7c2cc66310724a57be716 github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00 |