docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17581 from Microsoft/10662-factoroutexecuser 

Windows: Factor out user in execdriver\driver
This commit is contained in:
Brian Goff 2015-11-07 22:11:26 -05:00
parent bf5a6d2a83 910e4ba7ed
commit 342e6bb99f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/execdriver/driver.go
View File

@ -121,13 +121,6 @@ type ResourceStats struct {
SystemUsage uint64 `json:"system_usage"` SystemUsage uint64 `json:"system_usage"`
} }
// User contains the uid and gid representing a Unix user
// TODO Windows: Factor out User
type User struct {
UID int `json:"root_uid"`
GID int `json:"root_gid"`
}
// ProcessConfig describes a process that will be run inside a container. // ProcessConfig describes a process that will be run inside a container.
type ProcessConfig struct { type ProcessConfig struct {
exec.Cmd `json:"-"` exec.Cmd `json:"-"`

6
daemon/execdriver/driver_unix.go
View File

@ -256,3 +256,9 @@ func Stats(containerDir string, containerMemoryLimit int64, machineMemory int64)
MemoryLimit: memoryLimit, MemoryLimit: memoryLimit,
}, nil }, nil
} }
// User contains the uid and gid representing a Unix user
type User struct {
UID int `json:"root_uid"`
GID int `json:"root_gid"`
}