From c83c65ccd5ea0489dc0e06aff981b0c4911c354c Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Mon, 31 Aug 2015 14:34:53 -0700 Subject: [PATCH 1/2] Return golint-compliant naming for mappings It was lost in pull request about runtime config Signed-off-by: Alexander Morozov --- runtime_config_linux.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime_config_linux.go b/runtime_config_linux.go index 7a8b4953..e56265b9 100644 --- a/runtime_config_linux.go +++ b/runtime_config_linux.go @@ -10,10 +10,10 @@ type LinuxRuntimeSpec struct { } type LinuxRuntime struct { - // UidMapping specifies user mappings for supporting user namespaces on linux. - UidMappings []IDMapping `json:"uidMappings"` - // UidMapping specifies group mappings for supporting user namespaces on linux. - GidMappings []IDMapping `json:"gidMappings"` + // UIDMapping specifies user mappings for supporting user namespaces on linux. + UIDMappings []IDMapping `json:"uidMappings"` + // GIDMapping specifies group mappings for supporting user namespaces on linux. + GIDMappings []IDMapping `json:"gidMappings"` // Rlimits specifies rlimit options to apply to the container's process. Rlimits []Rlimit `json:"rlimits"` // Sysctl are a set of key value pairs that are set for the container on start From 31485faecb4738d1c25d556ec2a88f49fc7a2194 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Mon, 31 Aug 2015 14:55:20 -0700 Subject: [PATCH 2/2] Return golang compliant names for UID and GID in User Signed-off-by: Alexander Morozov --- config_linux.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config_linux.go b/config_linux.go index 2a43352a..4bfb7832 100644 --- a/config_linux.go +++ b/config_linux.go @@ -20,10 +20,10 @@ type Linux struct { // User specifies linux specific user and group information for the container's // main process. type User struct { - // Uid is the user id. - Uid int32 `json:"uid"` - // Gid is the group id. - Gid int32 `json:"gid"` + // UID is the user id. + UID int32 `json:"uid"` + // GID is the group id. + GID int32 `json:"gid"` // AdditionalGids are additional group ids set for the container's process. AdditionalGids []int32 `json:"additionalGids"` }