summaryrefslogtreecommitdiff
path: root/daemon/exec_linux.go
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2020-07-29 14:26:05 +0200
committerSebastiaan van Stijn <github@gone.nl>2020-09-09 13:25:59 +0200
commit65a33d02f6e75214b70ca5d826f1d2ad5b1f3bcf (patch)
tree5c44d260a52311121a629487828a5c87a06eb5dd /daemon/exec_linux.go
parentf50a40e889fdaeebf14fce1d494f95e60092d21d (diff)
downloaddocker-65a33d02f6e75214b70ca5d826f1d2ad5b1f3bcf.tar.gz
Simplify getUser() to use libcontainer built-in functionality
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'daemon/exec_linux.go')
-rw-r--r--daemon/exec_linux.go8
1 files changed, 2 insertions, 6 deletions
diff --git a/daemon/exec_linux.go b/daemon/exec_linux.go
index d0a7b3895c..e3aadb3326 100644
--- a/daemon/exec_linux.go
+++ b/daemon/exec_linux.go
@@ -12,15 +12,11 @@ import (
func (daemon *Daemon) execSetPlatformOpt(c *container.Container, ec *exec.Config, p *specs.Process) error {
if len(ec.User) > 0 {
- uid, gid, additionalGids, err := getUser(c, ec.User)
+ var err error
+ p.User, err = getUser(c, ec.User)
if err != nil {
return err
}
- p.User = specs.User{
- UID: uid,
- GID: gid,
- AdditionalGids: additionalGids,
- }
}
if ec.Privileged {
if p.Capabilities == nil {