summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2020-06-24 14:12:53 +0200
committerMatthew Heon <matthew.heon@pm.me>2020-07-06 13:31:13 -0400
commitf5b368400c1b7a1b1bdbb90f6a0d9fcbbd6802d0 (patch)
tree04d4df2b66289aca8a9273d1d5ea89c6861b8327
parent4995c511e581723ee9d441d500eda2e6d2e8a839 (diff)
downloadpodman-f5b368400c1b7a1b1bdbb90f6a0d9fcbbd6802d0.tar.gz
podman-f5b368400c1b7a1b1bdbb90f6a0d9fcbbd6802d0.tar.bz2
podman-f5b368400c1b7a1b1bdbb90f6a0d9fcbbd6802d0.zip
libpod: volume copyup honors namespace mappings
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--libpod/container_internal.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 934fe220f..e86512569 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -1854,8 +1854,8 @@ func (c *Container) unmount(force bool) error {
// this should be from chrootarchive.
// Container MUST be mounted before calling.
func (c *Container) copyWithTarFromImage(source, dest string) error {
- a := archive.NewDefaultArchiver()
-
+ mappings := idtools.NewIDMappingsFromMaps(c.config.IDMappings.UIDMap, c.config.IDMappings.GIDMap)
+ a := archive.NewArchiver(mappings)
if err := c.copyOwnerAndPerms(source, dest); err != nil {
return err
}