forked from moby/moby
-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BACKPORT: Fix copy API (
docker cp
, etc) uid/gid handling
Upstream reference: moby@8a7ff5f Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1461071 Signed-off-by: Antonio Murdaca <runcom@redhat.com>
- Loading branch information
Showing
14 changed files
with
209 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package daemon | ||
|
||
import ( | ||
"github.com/docker/docker/pkg/archive" | ||
) | ||
|
||
// defaultTarCopyOptions is the setting that is used when unpacking an archive | ||
// for a copy API event. | ||
func (daemon *Daemon) defaultTarCopyOptions(noOverwriteDirNonDir bool) *archive.TarOptions { | ||
uidMaps, gidMaps := daemon.GetUIDGIDMaps() | ||
return &archive.TarOptions{ | ||
NoOverwriteDirNonDir: noOverwriteDirNonDir, | ||
UIDMaps: uidMaps, | ||
GIDMaps: gidMaps, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
// +build !windows | ||
|
||
package daemon | ||
|
||
import ( | ||
"github.com/docker/docker/container" | ||
"github.com/docker/docker/pkg/archive" | ||
"github.com/opencontainers/runc/libcontainer/user" | ||
) | ||
|
||
func (daemon *Daemon) tarCopyOptions(container *container.Container, noOverwriteDirNonDir bool) (*archive.TarOptions, error) { | ||
if container.Config.User == "" { | ||
return daemon.defaultTarCopyOptions(noOverwriteDirNonDir), nil | ||
} | ||
|
||
// TODO(runcom): maybe use the newer docker/pkg/idtools which supports lookup | ||
// users by getent also. | ||
user, err := user.LookupUser(container.Config.User) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
return &archive.TarOptions{ | ||
NoOverwriteDirNonDir: noOverwriteDirNonDir, | ||
ChownOpts: &archive.TarChownOptions{ | ||
UID: user.Uid, | ||
GID: user.Gid, | ||
}, | ||
}, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
// +build windows | ||
|
||
package daemon | ||
|
||
import ( | ||
"github.com/docker/docker/container" | ||
"github.com/docker/docker/pkg/archive" | ||
) | ||
|
||
func (daemon *Daemon) tarCopyOptions(container *container.Container, noOverwriteDirNonDir bool) (*archive.TarOptions, error) { | ||
return daemon.defaultTarCopyOptions(noOverwriteDirNonDir), nil | ||
} |
Oops, something went wrong.