diff --git a/local/backend.go b/local/backend.go index 65da9405d..05e84a88a 100644 --- a/local/backend.go +++ b/local/backend.go @@ -172,6 +172,7 @@ func containerJSONToHostConfig(m *types.ContainerJSON) *containers.HostConfig { AutoRemove: m.HostConfig.AutoRemove, RestartPolicy: restartPolicy, 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, Resources: container.Resources{ NanoCPUs: int64(r.CPULimit * 1e9), + Memory: int64(r.MemLimit), }, } diff --git a/local/backend_test.go b/local/backend_test.go index 101770c59..428f1d2e3 100644 --- a/local/backend_test.go +++ b/local/backend_test.go @@ -54,6 +54,7 @@ func TestToHostConfig(t *testing.T) { }, Resources: container.Resources{ NanoCPUs: 750000000, + Memory: 512 * 1024 * 1024, }, }, } @@ -69,6 +70,7 @@ func TestToHostConfig(t *testing.T) { AutoRemove: true, RestartPolicy: containers.RestartPolicyNone, CPULimit: 0.75, + MemoryLimit: 512 * 1024 * 1024, } assert.DeepEqual(t, hc, res) }