From 910e4ba7ed3b686b549b09bfb2e5f860a4a52923 Mon Sep 17 00:00:00 2001 From: John Howard Date: Sat, 31 Oct 2015 19:19:24 -0700 Subject: [PATCH] Windows: Factor out user in execdriver\driver Signed-off-by: John Howard --- daemon/execdriver/driver.go | 7 ------- daemon/execdriver/driver_unix.go | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/daemon/execdriver/driver.go b/daemon/execdriver/driver.go index b842c0ea28..a474414c17 100644 --- a/daemon/execdriver/driver.go +++ b/daemon/execdriver/driver.go @@ -121,13 +121,6 @@ type ResourceStats struct { 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. type ProcessConfig struct { exec.Cmd `json:"-"` diff --git a/daemon/execdriver/driver_unix.go b/daemon/execdriver/driver_unix.go index af06219f03..a8431dfa57 100644 --- a/daemon/execdriver/driver_unix.go +++ b/daemon/execdriver/driver_unix.go @@ -257,3 +257,9 @@ func Stats(containerDir string, containerMemoryLimit int64, machineMemory int64) MemoryLimit: memoryLimit, }, nil } + +// User contains the uid and gid representing a Unix user +type User struct { + UID int `json:"root_uid"` + GID int `json:"root_gid"` +}