Windows: Plumb through user

John Howard · John Howard · commit 5207ff720232 · 2016-11-08T17:41:56.000-08:00
Signed-off-by: John Howard &lt;jhoward@microsoft.com&gt;
diff --git a/daemon/exec_windows.go b/daemon/exec_windows.go
@@ -9,5 +9,6 @@ import (
 func execSetPlatformOpt(c *container.Container, ec *exec.Config, p *libcontainerd.Process) error {
 	// Process arguments need to be escaped before sending to OCI.
 	p.Args = escapeArgs(p.Args)
+	p.User.Username = ec.User
 	return nil
 }
diff --git a/libcontainerd/client_windows.go b/libcontainerd/client_windows.go
@@ -301,6 +301,7 @@ func (clnt *client) AddProcess(ctx context.Context, containerID, processFriendly
 	// Configure the environment for the process
 	createProcessParms.Environment = setupEnvironmentVariables(procToAdd.Env)
 	createProcessParms.CommandLine = strings.Join(procToAdd.Args, " ")
+	createProcessParms.User = procToAdd.User.Username
 
 	logrus.Debugf("libcontainerd: commandLine: %s", createProcessParms.CommandLine)
 
diff --git a/libcontainerd/container_windows.go b/libcontainerd/container_windows.go
@@ -81,6 +81,7 @@ func (ctr *container) start(attachStdio StdioCallback) error {
 	// Configure the environment for the process
 	createProcessParms.Environment = setupEnvironmentVariables(ctr.ociSpec.Process.Env)
 	createProcessParms.CommandLine = strings.Join(ctr.ociSpec.Process.Args, " ")
+	createProcessParms.User = ctr.ociSpec.Process.User.Username
 
 	// Start the command running in the container.
 	newProcess, err := ctr.hcsContainer.CreateProcess(createProcessParms)

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@ import (`
`9`	`9`	`func execSetPlatformOpt(c container.Container, ec exec.Config, p *libcontainerd.Process) error {`
`10`	`10`	`// Process arguments need to be escaped before sending to OCI.`
`11`	`11`	`p.Args = escapeArgs(p.Args)`
	`12`	`+ p.User.Username = ec.User`
`12`	`13`	`return nil`
`13`	`14`	`}`