diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-22 02:02:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 02:02:34 -0700 |
| commit | 54b901fdda9b4ad21d866a12e3e13567d7f8a908 (patch) | |
| tree | 04ffcf5979fc8261e40d780843906efde7f9065b /libpod/runtime_ctr.go | |
| parent | 68e3df37248da85f58662c00e0934d1359f0fdc0 (diff) | |
| parent | 7f6f2f3f4a764f8e566752e61092254bd285424b (diff) | |
| download | podman-54b901fdda9b4ad21d866a12e3e13567d7f8a908.tar.gz podman-54b901fdda9b4ad21d866a12e3e13567d7f8a908.tar.bz2 podman-54b901fdda9b4ad21d866a12e3e13567d7f8a908.zip | |
Merge pull request #2716 from giuseppe/fix-volumes-userns
userns: mount the volumes from the intermediate namespace
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 3b74a65dd..f23dc86dd 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -186,8 +186,11 @@ func (r *Runtime) newContainer(ctx context.Context, rSpec *spec.Spec, options .. return nil, errors.Wrapf(err, "error creating named volume %q", vol.Source) } ctr.config.Spec.Mounts[i].Source = newVol.MountPoint() + if err := os.Chown(ctr.config.Spec.Mounts[i].Source, ctr.RootUID(), ctr.RootGID()); err != nil { + return nil, errors.Wrapf(err, "cannot chown %q to %d:%d", ctr.config.Spec.Mounts[i].Source, ctr.RootUID(), ctr.RootGID()) + } if err := ctr.copyWithTarFromImage(ctr.config.Spec.Mounts[i].Destination, ctr.config.Spec.Mounts[i].Source); err != nil && !os.IsNotExist(err) { - return nil, errors.Wrapf(err, "Failed to copy content into new volume mount %q", vol.Source) + return nil, errors.Wrapf(err, "failed to copy content into new volume mount %q", vol.Source) } continue } |