tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 15:44:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

backend.local: Add memory limits

Browse Source 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
This commit is contained in:
Chris Crone 2020-11-03 15:06:03 +01:00
parent 47aa069a3d
commit 6a9eca9bdf
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
local/backend.go
View File

@ -172,6 +172,7 @@ func containerJSONToHostConfig(m *types.ContainerJSON) *containers.HostConfig {
AutoRemove: m.HostConfig.AutoRemove, AutoRemove: m.HostConfig.AutoRemove,
RestartPolicy: restartPolicy, RestartPolicy: restartPolicy,
CPULimit: float64(m.HostConfig.Resources.NanoCPUs) / 1e9, CPULimit: float64(m.HostConfig.Resources.NanoCPUs) / 1e9,
MemoryLimit: uint64(m.HostConfig.Resources.Memory),
} }
} }
@ -219,6 +220,7 @@ func (ms *local) Run(ctx context.Context, r containers.ContainerConfig) error {
AutoRemove: r.AutoRemove, AutoRemove: r.AutoRemove,
Resources: container.Resources{ Resources: container.Resources{
NanoCPUs: int64(r.CPULimit * 1e9), NanoCPUs: int64(r.CPULimit * 1e9),
Memory: int64(r.MemLimit),
}, },
} }

2
local/backend_test.go
View File

@ -54,6 +54,7 @@ func TestToHostConfig(t *testing.T) {
}, },
Resources: container.Resources{ Resources: container.Resources{
NanoCPUs: 750000000, NanoCPUs: 750000000,
Memory: 512 * 1024 * 1024,
}, },
}, },
} }
@ -69,6 +70,7 @@ func TestToHostConfig(t *testing.T) {
AutoRemove: true, AutoRemove: true,
RestartPolicy: containers.RestartPolicyNone, RestartPolicy: containers.RestartPolicyNone,
CPULimit: 0.75, CPULimit: 0.75,
MemoryLimit: 512 * 1024 * 1024,
} }
assert.DeepEqual(t, hc, res) assert.DeepEqual(t, hc, res)
} }