Merge pull request #396 from joshwget/oom-score-adj

Add oom_score_adj

Author: joshwget

config/types.go

@@ -46,6 +46,7 @@ type ServiceConfigV1 struct {
 	MemSwapLimit  yaml.StringorInt     `yaml:"memswap_limit,omitempty"`
 	Name          string               `yaml:"name,omitempty"`
 	Net           string               `yaml:"net,omitempty"`
+	OomScoreAdj   yaml.StringorInt     `yaml:"oom_score_adj,omitempty"`
 	Pid           string               `yaml:"pid,omitempty"`
 	Uts           string               `yaml:"uts,omitempty"`
 	Ipc           string               `yaml:"ipc,omitempty"`
@@ -111,6 +112,7 @@ type ServiceConfig struct {
 	MemSwapLimit  yaml.StringorInt     `yaml:"memswap_limit,omitempty"`
 	NetworkMode   string               `yaml:"network_mode,omitempty"`
 	Networks      *yaml.Networks       `yaml:"networks,omitempty"`
+	OomScoreAdj   yaml.StringorInt     `yaml:"oom_score_adj,omitempty"`
 	Pid           string               `yaml:"pid,omitempty"`
 	Ports         []string             `yaml:"ports,omitempty"`
 	Privileged    bool                 `yaml:"privileged,omitempty"`

docker/service/convert.go

@@ -254,6 +254,7 @@ func Convert(c *config.ServiceConfig, ctx project.Context, clientFactory compose
 		},
 		NetworkMode:    container.NetworkMode(networkMode),
 		ReadonlyRootfs: c.ReadOnly,
+		OomScoreAdj:    int(c.OomScoreAdj),
 		PidMode:        container.PidMode(c.Pid),
 		UTSMode:        container.UTSMode(c.Uts),
 		IpcMode:        container.IpcMode(c.Ipc),

docker/service/convert_test.go

@@ -81,6 +81,17 @@ func TestParseLabels(t *testing.T) {
 	assert.Equal(t, []string{"less"}, []string(cfg.Entrypoint))
 }
 
+func TestOomScoreAdj(t *testing.T) {
+	ctx := &ctx.Context{}
+	sc := &config.ServiceConfig{
+		OomScoreAdj: 500,
+	}
+	_, hostCfg, err := Convert(sc, ctx.Context, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 500, hostCfg.OomScoreAdj)
+}
+
 func TestStopSignal(t *testing.T) {
 	ctx := &ctx.Context{}
 	sc := &config.ServiceConfig{