ctr: promote cOpts over opts, as oci.WithImageConfig requires snapshot

AkihiroSuda · AkihiroSuda · commit 51590f216eed · 2018-01-13T17:29:51.000+09:00
Signed-off-by: Akihiro Suda &lt;suda.akihiro@lab.ntt.co.jp&gt;
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -72,6 +72,9 @@ func newContainer(ctx gocontext.Context, client *containerd.Client, context *cli
 	if context.Bool("net-host") {
 		opts = append(opts, oci.WithHostNamespace(specs.NetworkNamespace), oci.WithHostHostsFile, oci.WithHostResolvconf)
 	}
-	cOpts = append([]containerd.NewContainerOpts{containerd.WithNewSpec(opts...)}, cOpts...)
+	// 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
+	cOpts = append(cOpts, []containerd.NewContainerOpts{containerd.WithNewSpec(opts...)}...)
 	return client.NewContainer(ctx, id, cOpts...)
 }

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,9 @@ func newContainer(ctx gocontext.Context, client containerd.Client, context cli`
`72`	`72`	`if context.Bool("net-host") {`
`73`	`73`	`opts = append(opts, oci.WithHostNamespace(specs.NetworkNamespace), oci.WithHostHostsFile, oci.WithHostResolvconf)`
`74`	`74`	`}`
`75`		`- cOpts = append([]containerd.NewContainerOpts{containerd.WithNewSpec(opts...)}, cOpts...)`
	`75`	`+ // oci.WithImageConfig (WithUsername, WithUserID) depends on rootfs snapshot for resolving /etc/passwd.`
	`76`	`+ // So cOpts needs to have precedence over opts.`
	`77`	`+ // TODO: WithUsername, WithUserID should additionally support non-snapshot rootfs`
	`78`	`+ cOpts = append(cOpts, []containerd.NewContainerOpts{containerd.WithNewSpec(opts...)}...)`
`76`	`79`	`return client.NewContainer(ctx, id, cOpts...)`
`77`	`80`	`}`