Add oom-score-adj option while running

README.md

@@ -394,7 +394,7 @@ Network flags:
 - :whale: `--add-host`: Add a custom host-to-IP mapping (host:ip)
 - :whale: `--ip`: Specific static IP address(es) to use
 
-Cgroup flags:
+Resource flags:
 - :whale: `--cpus`: Number of CPUs
 - :whale: `--cpu-quota`: Limit the CPU CFS (Completely Fair Scheduler) quota
 - :whale: `--cpu-period`: Limit the CPU CFS (Completely Fair Scheduler) period
@@ -407,6 +407,7 @@ Cgroup flags:
 - :whale: `--memory-swappiness`: Tune container memory swappiness (0 to 100) (default -1)
 - :whale: `--kernel-memory`: Kernel memory limit (deprecated)
 - :whale: `--oom-kill-disable`: Disable OOM Killer
+- :whale: `--oom-score-adj`: Tune container’s OOM preferences (-1000 to 1000)
 - :whale: `--pids-limit`: Tune container pids limit
 - :nerd_face: `--cgroup-conf`: Configure cgroup v2 (key=value)
 - :whale: `--blkio-weight`: Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)
@@ -522,7 +523,7 @@ Verify flags:
 Unimplemented `docker run` flags:
     `--attach`, `--blkio-weight-device`, `--cgroup-parent`, `--cpu-rt-*`, `--detach-keys`, `--device-*`,
     `--disable-content-trust`, `--domainname`, `--expose`, `--health-*`, `--ip6`, `--isolation`, `--no-healthcheck`,
-    `--oom-score-adj`, `--link*`, `--mac-address`, `--publish-all`, `--sig-proxy`, `--storage-opt`,
+    `--link*`, `--mac-address`, `--publish-all`, `--sig-proxy`, `--storage-opt`,
     `--userns`, `--uts`, `--volume-driver`, `--volumes-from`
 
 ### :whale: :blue_square: nerdctl exec

cmd/nerdctl/run.go

@@ -156,6 +156,7 @@ func setCreateFlags(cmd *cobra.Command) {
 	cmd.Flags().Int64("memory-swappiness", -1, "Tune container memory swappiness (0 to 100) (default -1)")
 	cmd.Flags().String("kernel-memory", "", "Kernel memory limit (deprecated)")
 	cmd.Flags().Bool("oom-kill-disable", false, "Disable OOM Killer")
+	cmd.Flags().Int("oom-score-adj", 0, "Tune container’s OOM preferences (-1000 to 1000)")
 	cmd.Flags().String("pid", "", "PID namespace to use")
 	cmd.RegisterFlagCompletionFunc("pid", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		return []string{"host"}, cobra.ShellCompDirectiveNoFileComp

cmd/nerdctl/run_linux.go

@@ -187,5 +187,31 @@ func setPlatformOptions(opts []oci.SpecOpts, cmd *cobra.Command, id string) ([]o
 		return nil, fmt.Errorf("error: %v", "invalid ipc value, supported values are 'private' or 'host'")
 	}
 
+	opts, err = setOOMScoreAdj(opts, cmd)
+	if err != nil {
+		return nil, err
+	}
+
+	return opts, nil
+}
+
+func setOOMScoreAdj(opts []oci.SpecOpts, cmd *cobra.Command) ([]oci.SpecOpts, error) {
+	score, err := cmd.Flags().GetInt("oom-score-adj")
+	if err != nil {
+		return nil, err
+	}
+
+	if score < -1000 || score > 1000 {
+		return nil, fmt.Errorf("invalid value %d, range for oom score adj is [-1000, 1000]", score)
+	}
+
+	opts = append(opts, withOOMScoreAdj(score))
 	return opts, nil
 }
+
+func withOOMScoreAdj(score int) oci.SpecOpts {
+	return func(_ context.Context, _ oci.Client, _ *containers.Container, s *oci.Spec) error {
+		s.Process.OOMScoreAdj = &score
+		return nil
+	}
+}

cmd/nerdctl/run_linux_test.go

@@ -29,6 +29,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/containerd/nerdctl/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/pkg/strutil"
 	"github.com/containerd/nerdctl/pkg/testutil"
 
@@ -331,3 +332,14 @@ func TestRunWithFluentdLogDriverWithLogOpt(t *testing.T) {
 	assert.Equal(t, true, strings.Contains(logData, "test2"))
 	assert.Equal(t, true, strings.Contains(logData, inspectedContainer.ID))
 }
+
+func TestRunWithOOMScoreAdj(t *testing.T) {
+	if rootlessutil.IsRootless() {
+		t.Skip("test skipped for rootless containers.")
+	}
+	t.Parallel()
+	base := testutil.NewBase(t)
+	var score = "-42"
+
+	base.Cmd("run", "--rm", "--oom-score-adj", score, testutil.AlpineImage, "cat", "/proc/self/oom_score_adj").AssertOutContains(score)
+}