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

Merge pull request #2669 from estesp/fix-withuser-comment

Browse Source 
Remove a TODO from the code comments that is complete
This commit is contained in:
Michael Crosby 2018-09-21 14:17:23 -04:00 committed by GitHub
commit 6496078ef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/ctr/commands/run/run_unix.go
View File

@ -149,9 +149,8 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
cOpts = append(cOpts, spec) cOpts = append(cOpts, spec)
// oci.WithImageConfig (WithUsername, WithUserID) depends on rootfs snapshot for resolving /etc/passwd. // oci.WithImageConfig (WithUsername, WithUserID) depends on access to rootfs for resolving via
// So cOpts needs to have precedence over opts. // the /etc/{passwd,group} files. So cOpts needs to have precedence over opts.
// TODO: WithUsername, WithUserID should additionally support non-snapshot rootfs
return client.NewContainer(ctx, id, cOpts...) return client.NewContainer(ctx, id, cOpts...)
} }