opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-01 02:27:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Vendor in latest containers/buildah

Browse Source 
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
This commit is contained in:
Daniel J Walsh
2018-09-21 06:45:28 -04:00
committed by Atomic Bot
parent c4b15ce46b
commit 2d1b3e6c30
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/containers/buildah/README.md generated vendored
View File

@@ -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

11
vendor/github.com/containers/buildah/run.go generated vendored
View File

@@ -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{

2
vendor/github.com/containers/buildah/vendor.conf generated vendored
View File

@@ -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