jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #132 from LK4D4/fix_uid_map_naming 

Return golint-compliant naming for mappings
This commit is contained in:
Mrunal Patel 2015-08-31 19:42:59 -07:00
parent 4459fb5ed6 31485faecb
commit 4d18a5287f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config_linux.go
View File

@ -20,10 +20,10 @@ type Linux struct {
// User specifies linux specific user and group information for the container's // User specifies linux specific user and group information for the container's
// main process. // main process.
type User struct { type User struct {
// Uid is the user id. // UID is the user id.
Uid int32 `json:"uid"` UID int32 `json:"uid"`
// Gid is the group id. // GID is the group id.
Gid int32 `json:"gid"` GID int32 `json:"gid"`
// AdditionalGids are additional group ids set for the container's process. // AdditionalGids are additional group ids set for the container's process.
AdditionalGids []int32 `json:"additionalGids"` AdditionalGids []int32 `json:"additionalGids"`
} }

8
runtime_config_linux.go
View File

@ -10,10 +10,10 @@ type LinuxRuntimeSpec struct {
} }
type LinuxRuntime struct { type LinuxRuntime struct {
// UidMapping specifies user mappings for supporting user namespaces on linux. // UIDMapping specifies user mappings for supporting user namespaces on linux.
UidMappings []IDMapping `json:"uidMappings"` UIDMappings []IDMapping `json:"uidMappings"`
// UidMapping specifies group mappings for supporting user namespaces on linux. // GIDMapping specifies group mappings for supporting user namespaces on linux.
GidMappings []IDMapping `json:"gidMappings"` GIDMappings []IDMapping `json:"gidMappings"`
// Rlimits specifies rlimit options to apply to the container's process. // Rlimits specifies rlimit options to apply to the container's process.
Rlimits []Rlimit `json:"rlimits"` Rlimits []Rlimit `json:"rlimits"`
// Sysctl are a set of key value pairs that are set for the container on start // Sysctl are a set of key value pairs that are set for the container on start