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

crosbymichael · web-flow · commit 6496078ef821 · 2018-09-21T14:17:23.000-04:00
Remove a TODO from the code comments that is complete
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -149,9 +149,8 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
 
 	cOpts = append(cOpts, spec)
 
-	// oci.WithImageConfig (WithUsername, WithUserID) depends on rootfs snapshot for resolving /etc/passwd.
-	// So cOpts needs to have precedence over opts.
-	// TODO: WithUsername, WithUserID should additionally support non-snapshot rootfs
+	// oci.WithImageConfig (WithUsername, WithUserID) depends on access to rootfs for resolving via
+	// the /etc/{passwd,group} files. So cOpts needs to have precedence over opts.
 	return client.NewContainer(ctx, id, cOpts...)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -149,9 +149,8 @@ func NewContainer(ctx gocontext.Context, client containerd.Client, context cli`
`149`	`149`
`150`	`150`	`cOpts = append(cOpts, spec)`
`151`	`151`
`152`		`- // oci.WithImageConfig (WithUsername, WithUserID) depends on rootfs snapshot for resolving /etc/passwd.`
`153`		`- // So cOpts needs to have precedence over opts.`
`154`		`- // TODO: WithUsername, WithUserID should additionally support non-snapshot rootfs`
	`152`	`+ // oci.WithImageConfig (WithUsername, WithUserID) depends on access to rootfs for resolving via`
	`153`	`+ // the /etc/{passwd,group} files. So cOpts needs to have precedence over opts.`
`155`	`154`	`return client.NewContainer(ctx, id, cOpts...)`
`156`	`155`	`}`
`157`	`156`