diff options
| author | John Howard <jhoward@microsoft.com> | 2016-09-27 10:26:59 -0700 |
|---|---|---|
| committer | John Howard <jhoward@microsoft.com> | 2016-09-27 12:07:35 -0700 |
| commit | 02309170a5fb97d40260d0ee9e24b44be8c780b2 (patch) | |
| tree | 21b296e6eeb1eaac6e6ed2bfe99c02a76afb211d /daemon/exec_linux.go | |
| parent | ba2df174935b5119f336e7f3ab5228cd41279791 (diff) | |
| download | docker-02309170a5fb97d40260d0ee9e24b44be8c780b2.tar.gz | |
Remove hacked Windows OCI spec, compile fixups
Signed-off-by: John Howard <jhoward@microsoft.com>
Diffstat (limited to 'daemon/exec_linux.go')
| -rw-r--r-- | daemon/exec_linux.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon/exec_linux.go b/daemon/exec_linux.go index a2c86b2868..5aeedc3470 100644 --- a/daemon/exec_linux.go +++ b/daemon/exec_linux.go @@ -5,6 +5,7 @@ import ( "github.com/docker/docker/daemon/caps" "github.com/docker/docker/daemon/exec" "github.com/docker/docker/libcontainerd" + "github.com/opencontainers/runtime-spec/specs-go" ) func execSetPlatformOpt(c *container.Container, ec *exec.Config, p *libcontainerd.Process) error { @@ -13,7 +14,7 @@ func execSetPlatformOpt(c *container.Container, ec *exec.Config, p *libcontainer if err != nil { return err } - p.User = &libcontainerd.User{ + p.User = &specs.User{ UID: uid, GID: gid, AdditionalGids: additionalGids, |