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

Merge pull request #2259 from Random-Liu/cleanup-with-user

Browse Source 
Improve WithUser comments and code style.
This commit is contained in:
Stephen Day 2018-03-30 15:29:08 -07:00 committed by GitHub
commit bf5112e8ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats 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
// and set the correct UID and GID for container.
func WithUser(userstr string) SpecOpts {
return func(ctx context.Context, client Client, c *containers.Container, s *specs.Spec) error {
parts := strings.Split(userstr, ":")
@ -249,7 +249,10 @@ func WithUser(userstr string) SpecOpts {
}
return WithUserID(uint32(v))(ctx, client, c, s)
case 2:
var username, groupname string
var (
username string
groupname string
)
var uid, gid uint32
v, err := strconv.Atoi(parts[0])
if err != nil {