accept 'implicit', image defined user and cmd (as well as entrypoint)

srl-labs · Jun 10, 2021 · 4b87dfa · 4b87dfa
1 parent f1996a1
commit 4b87dfa
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/runtime/containerd/containerd.go b/runtime/containerd/containerd.go
@@ -129,10 +129,8 @@ func (c *ContainerdRuntime) CreateContainer(ctx context.Context, node *types.Nod
 	opts := []oci.SpecOpts{
 		oci.WithImageConfig(img),
 		oci.WithEnv(utils.ConvertEnvs(node.Env)),
-		oci.WithProcessArgs(cmd...),
 		//oci.WithProcessArgs("bash"),
 		oci.WithHostname(node.ShortName),
-		oci.WithUser(node.User),
 		WithSysctls(node.Sysctls),
 		//oci.WithAllKnownCapabilities,
 		oci.WithoutRunMount,
@@ -144,6 +142,12 @@ func (c *ContainerdRuntime) CreateContainer(ctx context.Context, node *types.Nod
 		//oci.WithHostDevices,
 		oci.WithNewPrivileges,
 	}
+	if len(cmd) > 0 {
+		opts = append(opts, oci.WithProcessArgs(cmd...))
+	}
+	if node.User != "" {
+		opts = append(opts, oci.WithUser(node.User))
+	}
 
 	if len(mounts) > 0 {
 		opts = append(opts, oci.WithMounts(mounts))