From 41615e8ded6bac52bd9e0a048b8db6abd801c4b6 Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Thu, 20 Sep 2018 09:07:36 -0400 Subject: [PATCH] Remove a TODO from the code comments that is complete WithUser... helpers do support non-snapshot rootfs now. Signed-off-by: Phil Estes --- cmd/ctr/commands/run/run_unix.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index a6d61bf5d..5f553cd65 100644 --- 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...) }