Merge pull request #406 from joshwget/oom-kill-disable

joshwget · web-flow · commit f12d14623f73 · 2017-01-17T17:04:15.000-08:00
Add oom_kill_disable
diff --git a/config/types.go b/config/types.go
@@ -19,61 +19,62 @@ type ResourceLookup interface {
 
 // ServiceConfigV1 holds version 1 of libcompose service configuration
 type ServiceConfigV1 struct {
-	Build         string               `yaml:"build,omitempty"`
-	CapAdd        []string             `yaml:"cap_add,omitempty"`
-	CapDrop       []string             `yaml:"cap_drop,omitempty"`
-	CgroupParent  string               `yaml:"cgroup_parent,omitempty"`
-	CPUQuota      yaml.StringorInt     `yaml:"cpu_quota,omitempty"`
-	CPUSet        string               `yaml:"cpuset,omitempty"`
-	CPUShares     yaml.StringorInt     `yaml:"cpu_shares,omitempty"`
-	Command       yaml.Command         `yaml:"command,flow,omitempty"`
-	ContainerName string               `yaml:"container_name,omitempty"`
-	Devices       []string             `yaml:"devices,omitempty"`
-	DNS           yaml.Stringorslice   `yaml:"dns,omitempty"`
-	DNSOpts       []string             `yaml:"dns_opt,omitempty"`
-	DNSSearch     yaml.Stringorslice   `yaml:"dns_search,omitempty"`
-	Dockerfile    string               `yaml:"dockerfile,omitempty"`
-	DomainName    string               `yaml:"domainname,omitempty"`
-	Entrypoint    yaml.Command         `yaml:"entrypoint,flow,omitempty"`
-	EnvFile       yaml.Stringorslice   `yaml:"env_file,omitempty"`
-	Environment   yaml.MaporEqualSlice `yaml:"environment,omitempty"`
-	GroupAdd      []string             `yaml:"group_add,omitempty"`
-	Hostname      string               `yaml:"hostname,omitempty"`
-	Image         string               `yaml:"image,omitempty"`
-	Isolation     string               `yaml:"isolation,omitempty"`
-	Labels        yaml.SliceorMap      `yaml:"labels,omitempty"`
-	Links         yaml.MaporColonSlice `yaml:"links,omitempty"`
-	LogDriver     string               `yaml:"log_driver,omitempty"`
-	MacAddress    string               `yaml:"mac_address,omitempty"`
-	MemLimit      yaml.MemStringorInt  `yaml:"mem_limit,omitempty"`
-	MemSwapLimit  yaml.MemStringorInt  `yaml:"memswap_limit,omitempty"`
-	MemSwappiness yaml.MemStringorInt  `yaml:"mem_swappiness,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"`
-	Ports         []string             `yaml:"ports,omitempty"`
-	Privileged    bool                 `yaml:"privileged,omitempty"`
-	Restart       string               `yaml:"restart,omitempty"`
-	ReadOnly      bool                 `yaml:"read_only,omitempty"`
-	ShmSize       yaml.MemStringorInt  `yaml:"shm_size,omitempty"`
-	StdinOpen     bool                 `yaml:"stdin_open,omitempty"`
-	SecurityOpt   []string             `yaml:"security_opt,omitempty"`
-	StopSignal    string               `yaml:"stop_signal,omitempty"`
-	Tmpfs         yaml.Stringorslice   `yaml:"tmpfs,omitempty"`
-	Tty           bool                 `yaml:"tty,omitempty"`
-	User          string               `yaml:"user,omitempty"`
-	VolumeDriver  string               `yaml:"volume_driver,omitempty"`
-	Volumes       []string             `yaml:"volumes,omitempty"`
-	VolumesFrom   []string             `yaml:"volumes_from,omitempty"`
-	WorkingDir    string               `yaml:"working_dir,omitempty"`
-	Expose        []string             `yaml:"expose,omitempty"`
-	ExternalLinks []string             `yaml:"external_links,omitempty"`
-	LogOpt        map[string]string    `yaml:"log_opt,omitempty"`
-	ExtraHosts    []string             `yaml:"extra_hosts,omitempty"`
-	Ulimits       yaml.Ulimits         `yaml:"ulimits,omitempty"`
+	Build          string               `yaml:"build,omitempty"`
+	CapAdd         []string             `yaml:"cap_add,omitempty"`
+	CapDrop        []string             `yaml:"cap_drop,omitempty"`
+	CgroupParent   string               `yaml:"cgroup_parent,omitempty"`
+	CPUQuota       yaml.StringorInt     `yaml:"cpu_quota,omitempty"`
+	CPUSet         string               `yaml:"cpuset,omitempty"`
+	CPUShares      yaml.StringorInt     `yaml:"cpu_shares,omitempty"`
+	Command        yaml.Command         `yaml:"command,flow,omitempty"`
+	ContainerName  string               `yaml:"container_name,omitempty"`
+	Devices        []string             `yaml:"devices,omitempty"`
+	DNS            yaml.Stringorslice   `yaml:"dns,omitempty"`
+	DNSOpts        []string             `yaml:"dns_opt,omitempty"`
+	DNSSearch      yaml.Stringorslice   `yaml:"dns_search,omitempty"`
+	Dockerfile     string               `yaml:"dockerfile,omitempty"`
+	DomainName     string               `yaml:"domainname,omitempty"`
+	Entrypoint     yaml.Command         `yaml:"entrypoint,flow,omitempty"`
+	EnvFile        yaml.Stringorslice   `yaml:"env_file,omitempty"`
+	Environment    yaml.MaporEqualSlice `yaml:"environment,omitempty"`
+	GroupAdd       []string             `yaml:"group_add,omitempty"`
+	Hostname       string               `yaml:"hostname,omitempty"`
+	Image          string               `yaml:"image,omitempty"`
+	Isolation      string               `yaml:"isolation,omitempty"`
+	Labels         yaml.SliceorMap      `yaml:"labels,omitempty"`
+	Links          yaml.MaporColonSlice `yaml:"links,omitempty"`
+	LogDriver      string               `yaml:"log_driver,omitempty"`
+	MacAddress     string               `yaml:"mac_address,omitempty"`
+	MemLimit       yaml.MemStringorInt  `yaml:"mem_limit,omitempty"`
+	MemSwapLimit   yaml.MemStringorInt  `yaml:"memswap_limit,omitempty"`
+	MemSwappiness  yaml.MemStringorInt  `yaml:"mem_swappiness,omitempty"`
+	Name           string               `yaml:"name,omitempty"`
+	Net            string               `yaml:"net,omitempty"`
+	OomKillDisable bool                 `yaml:"oom_kill_disable,omitempty"`
+	OomScoreAdj    yaml.StringorInt     `yaml:"oom_score_adj,omitempty"`
+	Pid            string               `yaml:"pid,omitempty"`
+	Uts            string               `yaml:"uts,omitempty"`
+	Ipc            string               `yaml:"ipc,omitempty"`
+	Ports          []string             `yaml:"ports,omitempty"`
+	Privileged     bool                 `yaml:"privileged,omitempty"`
+	Restart        string               `yaml:"restart,omitempty"`
+	ReadOnly       bool                 `yaml:"read_only,omitempty"`
+	ShmSize        yaml.MemStringorInt  `yaml:"shm_size,omitempty"`
+	StdinOpen      bool                 `yaml:"stdin_open,omitempty"`
+	SecurityOpt    []string             `yaml:"security_opt,omitempty"`
+	StopSignal     string               `yaml:"stop_signal,omitempty"`
+	Tmpfs          yaml.Stringorslice   `yaml:"tmpfs,omitempty"`
+	Tty            bool                 `yaml:"tty,omitempty"`
+	User           string               `yaml:"user,omitempty"`
+	VolumeDriver   string               `yaml:"volume_driver,omitempty"`
+	Volumes        []string             `yaml:"volumes,omitempty"`
+	VolumesFrom    []string             `yaml:"volumes_from,omitempty"`
+	WorkingDir     string               `yaml:"working_dir,omitempty"`
+	Expose         []string             `yaml:"expose,omitempty"`
+	ExternalLinks  []string             `yaml:"external_links,omitempty"`
+	LogOpt         map[string]string    `yaml:"log_opt,omitempty"`
+	ExtraHosts     []string             `yaml:"extra_hosts,omitempty"`
+	Ulimits        yaml.Ulimits         `yaml:"ulimits,omitempty"`
 }
 
 // Log holds v2 logging information
@@ -84,61 +85,62 @@ type Log struct {
 
 // ServiceConfig holds version 2 of libcompose service configuration
 type ServiceConfig struct {
-	Build         yaml.Build           `yaml:"build,omitempty"`
-	CapAdd        []string             `yaml:"cap_add,omitempty"`
-	CapDrop       []string             `yaml:"cap_drop,omitempty"`
-	CPUSet        string               `yaml:"cpuset,omitempty"`
-	CPUShares     yaml.StringorInt     `yaml:"cpu_shares,omitempty"`
-	CPUQuota      yaml.StringorInt     `yaml:"cpu_quota,omitempty"`
-	Command       yaml.Command         `yaml:"command,flow,omitempty"`
-	CgroupParent  string               `yaml:"cgroup_parent,omitempty"`
-	ContainerName string               `yaml:"container_name,omitempty"`
-	Devices       []string             `yaml:"devices,omitempty"`
-	DependsOn     []string             `yaml:"depends_on,omitempty"`
-	DNS           yaml.Stringorslice   `yaml:"dns,omitempty"`
-	DNSOpts       []string             `yaml:"dns_opt,omitempty"`
-	DNSSearch     yaml.Stringorslice   `yaml:"dns_search,omitempty"`
-	DomainName    string               `yaml:"domainname,omitempty"`
-	Entrypoint    yaml.Command         `yaml:"entrypoint,flow,omitempty"`
-	EnvFile       yaml.Stringorslice   `yaml:"env_file,omitempty"`
-	Environment   yaml.MaporEqualSlice `yaml:"environment,omitempty"`
-	Expose        []string             `yaml:"expose,omitempty"`
-	Extends       yaml.MaporEqualSlice `yaml:"extends,omitempty"`
-	ExternalLinks []string             `yaml:"external_links,omitempty"`
-	ExtraHosts    []string             `yaml:"extra_hosts,omitempty"`
-	GroupAdd      []string             `yaml:"group_add,omitempty"`
-	Image         string               `yaml:"image,omitempty"`
-	Isolation     string               `yaml:"isolation,omitempty"`
-	Hostname      string               `yaml:"hostname,omitempty"`
-	Ipc           string               `yaml:"ipc,omitempty"`
-	Labels        yaml.SliceorMap      `yaml:"labels,omitempty"`
-	Links         yaml.MaporColonSlice `yaml:"links,omitempty"`
-	Logging       Log                  `yaml:"logging,omitempty"`
-	MacAddress    string               `yaml:"mac_address,omitempty"`
-	MemLimit      yaml.MemStringorInt  `yaml:"mem_limit,omitempty"`
-	MemSwapLimit  yaml.MemStringorInt  `yaml:"memswap_limit,omitempty"`
-	MemSwappiness yaml.MemStringorInt  `yaml:"mem_swappiness,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"`
-	SecurityOpt   []string             `yaml:"security_opt,omitempty"`
-	ShmSize       yaml.MemStringorInt  `yaml:"shm_size,omitempty"`
-	StopSignal    string               `yaml:"stop_signal,omitempty"`
-	Tmpfs         yaml.Stringorslice   `yaml:"tmpfs,omitempty"`
-	VolumeDriver  string               `yaml:"volume_driver,omitempty"`
-	Volumes       *yaml.Volumes        `yaml:"volumes,omitempty"`
-	VolumesFrom   []string             `yaml:"volumes_from,omitempty"`
-	Uts           string               `yaml:"uts,omitempty"`
-	Restart       string               `yaml:"restart,omitempty"`
-	ReadOnly      bool                 `yaml:"read_only,omitempty"`
-	StdinOpen     bool                 `yaml:"stdin_open,omitempty"`
-	Tty           bool                 `yaml:"tty,omitempty"`
-	User          string               `yaml:"user,omitempty"`
-	WorkingDir    string               `yaml:"working_dir,omitempty"`
-	Ulimits       yaml.Ulimits         `yaml:"ulimits,omitempty"`
+	Build          yaml.Build           `yaml:"build,omitempty"`
+	CapAdd         []string             `yaml:"cap_add,omitempty"`
+	CapDrop        []string             `yaml:"cap_drop,omitempty"`
+	CPUSet         string               `yaml:"cpuset,omitempty"`
+	CPUShares      yaml.StringorInt     `yaml:"cpu_shares,omitempty"`
+	CPUQuota       yaml.StringorInt     `yaml:"cpu_quota,omitempty"`
+	Command        yaml.Command         `yaml:"command,flow,omitempty"`
+	CgroupParent   string               `yaml:"cgroup_parent,omitempty"`
+	ContainerName  string               `yaml:"container_name,omitempty"`
+	Devices        []string             `yaml:"devices,omitempty"`
+	DependsOn      []string             `yaml:"depends_on,omitempty"`
+	DNS            yaml.Stringorslice   `yaml:"dns,omitempty"`
+	DNSOpts        []string             `yaml:"dns_opt,omitempty"`
+	DNSSearch      yaml.Stringorslice   `yaml:"dns_search,omitempty"`
+	DomainName     string               `yaml:"domainname,omitempty"`
+	Entrypoint     yaml.Command         `yaml:"entrypoint,flow,omitempty"`
+	EnvFile        yaml.Stringorslice   `yaml:"env_file,omitempty"`
+	Environment    yaml.MaporEqualSlice `yaml:"environment,omitempty"`
+	Expose         []string             `yaml:"expose,omitempty"`
+	Extends        yaml.MaporEqualSlice `yaml:"extends,omitempty"`
+	ExternalLinks  []string             `yaml:"external_links,omitempty"`
+	ExtraHosts     []string             `yaml:"extra_hosts,omitempty"`
+	GroupAdd       []string             `yaml:"group_add,omitempty"`
+	Image          string               `yaml:"image,omitempty"`
+	Isolation      string               `yaml:"isolation,omitempty"`
+	Hostname       string               `yaml:"hostname,omitempty"`
+	Ipc            string               `yaml:"ipc,omitempty"`
+	Labels         yaml.SliceorMap      `yaml:"labels,omitempty"`
+	Links          yaml.MaporColonSlice `yaml:"links,omitempty"`
+	Logging        Log                  `yaml:"logging,omitempty"`
+	MacAddress     string               `yaml:"mac_address,omitempty"`
+	MemLimit       yaml.MemStringorInt  `yaml:"mem_limit,omitempty"`
+	MemSwapLimit   yaml.MemStringorInt  `yaml:"memswap_limit,omitempty"`
+	MemSwappiness  yaml.MemStringorInt  `yaml:"mem_swappiness,omitempty"`
+	NetworkMode    string               `yaml:"network_mode,omitempty"`
+	Networks       *yaml.Networks       `yaml:"networks,omitempty"`
+	OomKillDisable bool                 `yaml:"oom_kill_disable,omitempty"`
+	OomScoreAdj    yaml.StringorInt     `yaml:"oom_score_adj,omitempty"`
+	Pid            string               `yaml:"pid,omitempty"`
+	Ports          []string             `yaml:"ports,omitempty"`
+	Privileged     bool                 `yaml:"privileged,omitempty"`
+	SecurityOpt    []string             `yaml:"security_opt,omitempty"`
+	ShmSize        yaml.MemStringorInt  `yaml:"shm_size,omitempty"`
+	StopSignal     string               `yaml:"stop_signal,omitempty"`
+	Tmpfs          yaml.Stringorslice   `yaml:"tmpfs,omitempty"`
+	VolumeDriver   string               `yaml:"volume_driver,omitempty"`
+	Volumes        *yaml.Volumes        `yaml:"volumes,omitempty"`
+	VolumesFrom    []string             `yaml:"volumes_from,omitempty"`
+	Uts            string               `yaml:"uts,omitempty"`
+	Restart        string               `yaml:"restart,omitempty"`
+	ReadOnly       bool                 `yaml:"read_only,omitempty"`
+	StdinOpen      bool                 `yaml:"stdin_open,omitempty"`
+	Tty            bool                 `yaml:"tty,omitempty"`
+	User           string               `yaml:"user,omitempty"`
+	WorkingDir     string               `yaml:"working_dir,omitempty"`
+	Ulimits        yaml.Ulimits         `yaml:"ulimits,omitempty"`
 }
 
 // VolumeConfig holds v2 volume configuration
diff --git a/docker/service/convert.go b/docker/service/convert.go
@@ -193,6 +193,7 @@ func Convert(c *config.ServiceConfig, ctx project.Context, clientFactory compose
 		CpusetCpus:       c.CPUSet,
 		Ulimits:          ulimits,
 		Devices:          deviceMappings,
+		OomKillDisable:   &c.OomKillDisable,
 	}
 
 	networkMode := c.NetworkMode
diff --git a/docker/service/convert_test.go b/docker/service/convert_test.go
@@ -138,6 +138,17 @@ func TestMemSwappiness(t *testing.T) {
 	assert.Equal(t, int64(10), *hostCfg.MemorySwappiness)
 }
 
+func TestOomKillDisable(t *testing.T) {
+	ctx := &ctx.Context{}
+	sc := &config.ServiceConfig{
+		OomKillDisable: true,
+	}
+	_, hostCfg, err := Convert(sc, ctx.Context, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, true, *hostCfg.OomKillDisable)
+}
+
 func TestOomScoreAdj(t *testing.T) {
 	ctx := &ctx.Context{}
 	sc := &config.ServiceConfig{

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@ func Convert(c *config.ServiceConfig, ctx project.Context, clientFactory compose`
`193`	`193`	`CpusetCpus: c.CPUSet,`
`194`	`194`	`Ulimits: ulimits,`
`195`	`195`	`Devices: deviceMappings,`
	`196`	`+ OomKillDisable: &c.OomKillDisable,`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`networkMode := c.NetworkMode`