1
0
mirror of https://github.com/rancher/os.git synced 2025-09-16 06:59:12 +00:00

Bump libcompose to version with oom_score_adj support

This commit is contained in:
Olli Janatuinen
2020-12-19 19:06:46 +02:00
parent 4866d88d0c
commit bb62c58b2b
4 changed files with 5 additions and 1 deletions

View File

@@ -10,7 +10,7 @@ github.com/docker/docker b40c87254f587af7cad8e8128f061a2a7f367343 https://github
github.com/docker/engine-api v0.3.3
github.com/docker/go-connections v0.2.0
github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
github.com/docker/libcompose 2987bb539b670b71a33575bdee00bd351be60f20 https://github.com/rancher/libcompose.git
github.com/docker/libcompose ff6233ed789125e6e6e2e9b944d50a2bd8975e48 https://github.com/burmilla/libcompose.git
github.com/docker/libnetwork v0.5.6
github.com/docker/machine 4a8e93ac9bc2ced1c3bc4a43c03fdaa1c2749205
github.com/flynn/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff

View File

@@ -357,6 +357,7 @@ var schemaV2 = `{
}
]
},
"oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
"pid": {"type": ["string", "null"]},
"ports": {

View File

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

View File

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