diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-09 00:44:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 00:44:30 +0200 |
| commit | 4349f42d66d91fa48cde6aa6ed499eaa41d3e2b5 (patch) | |
| tree | 37cf7d2f4e39c8cf35aa1d6b67cd57fa4db5cd48 /cmd | |
| parent | 202eadef2cd46f3a74075a6cfe4e4064d0e14a63 (diff) | |
| parent | a2561ec58a1db6851a94d20c38fb1c913830cd34 (diff) | |
| download | podman-4349f42d66d91fa48cde6aa6ed499eaa41d3e2b5.tar.gz podman-4349f42d66d91fa48cde6aa6ed499eaa41d3e2b5.tar.bz2 podman-4349f42d66d91fa48cde6aa6ed499eaa41d3e2b5.zip | |
Merge pull request #3767 from QiWang19/cp_chown
fix copy change file owner if cp from container
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/cp.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/cp.go b/cmd/podman/cp.go index bee7d2199..ad7253ac0 100644 --- a/cmd/podman/cp.go +++ b/cmd/podman/cp.go @@ -140,7 +140,7 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin if err != nil { return errors.Wrapf(err, "error getting IDMappingOptions") } - containerOwner := idtools.IDPair{UID: int(user.UID), GID: int(user.GID)} + destOwner := idtools.IDPair{UID: int(user.UID), GID: int(user.GID)} hostUID, hostGID, err := util.GetHostIDs(convertIDMap(idMappingOpts.UIDMap), convertIDMap(idMappingOpts.GIDMap), user.UID, user.GID) if err != nil { return err @@ -183,6 +183,7 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin destPath = cleanedPath } } else { + destOwner = idtools.IDPair{UID: os.Getuid(), GID: os.Getgid()} if isVol, volDestName, volName := isVolumeDestName(srcPath, ctr); isVol { path, err := pathWithVolumeMount(ctr, runtime, volDestName, volName, srcPath) if err != nil { @@ -230,7 +231,7 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin src = os.Stdin.Name() extract = true } - err := copy(src, destPath, dest, idMappingOpts, &containerOwner, extract, isFromHostToCtr) + err := copy(src, destPath, dest, idMappingOpts, &destOwner, extract, isFromHostToCtr) if lastError != nil { logrus.Error(lastError) } |