Merge pull request #565 from jhowardmsft/jjh/user

Windows: User struct changes
This commit is contained in:
Vincent Batts 2016-09-15 11:21:57 -04:00 committed by GitHub
commit a992b1b72a
2 changed files with 27 additions and 2 deletions

View File

@ -186,7 +186,31 @@ _Note: For Solaris, uid and gid specify the uid and gid of the process inside th
"cwd": "/root",
"args": [
"/usr/bin/bash"
]
}
```
#### Windows User
For Windows based systems the user structure has the following fields:
* **`username`** (string, optional) specifies the user name for the process.
### Example (Windows)
```json
"process": {
"terminal": true,
"user": {
"username": "containeradministrator"
},
"env": [
"VARIABLE=1"
],
"cwd": "c:\\foo",
"args": [
"someapp.exe",
]
}
```

View File

@ -53,8 +53,7 @@ type Process struct {
SelinuxLabel string `json:"selinuxLabel,omitempty" platform:"linux"`
}
// User specifies Linux/Solaris specific user and group information
// for the container process.
// User specifies specific user (and group) information for the container process.
type User struct {
// UID is the user id.
UID uint32 `json:"uid" platform:"linux,solaris"`
@ -62,6 +61,8 @@ type User struct {
GID uint32 `json:"gid" platform:"linux,solaris"`
// AdditionalGids are additional group ids set for the container's process.
AdditionalGids []uint32 `json:"additionalGids,omitempty" platform:"linux,solaris"`
// Username is the user name. (this field is platform dependent)
Username string `json:"username,omitempty" platform:"windows"`
}
// Root contains information about the container's root filesystem on the host.