github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Improve WithUser comments and code style.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-03-30 20:33:55 +00:00
parent c0f7fcd910
commit 00b600a605
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
oci/spec_opts_unix.go
View File

@@ -234,9 +234,9 @@ func WithNamespacedCgroup() SpecOpts {
} }
} }
// WithUser accepts a valid user string in OCI Image Spec v1.0.0: // WithUser sets the user to be used within the container.
// It accepts a valid user string in OCI Image Spec v1.0.0:
// user, uid, user:group, uid:gid, uid:group, user:gid // user, uid, user:group, uid:gid, uid:group, user:gid
// and set the correct UID and GID for container.
func WithUser(userstr string) SpecOpts { func WithUser(userstr string) SpecOpts {
return func(ctx context.Context, client Client, c *containers.Container, s *specs.Spec) error { return func(ctx context.Context, client Client, c *containers.Container, s *specs.Spec) error {
parts := strings.Split(userstr, ":") parts := strings.Split(userstr, ":")
@@ -249,7 +249,10 @@ func WithUser(userstr string) SpecOpts {
} }
return WithUserID(uint32(v))(ctx, client, c, s) return WithUserID(uint32(v))(ctx, client, c, s)
case 2: case 2:
var username, groupname string var (
username string
groupname string
)
var uid, gid uint32 var uid, gid uint32
v, err := strconv.Atoi(parts[0]) v, err := strconv.Atoi(parts[0])
if err != nil { if err != nil {