ソースを参照

backend.local: Add memory limits

Signed-off-by: Chris Crone <[email protected]>
Chris Crone 5 年 前
コミット
6a9eca9bdf
2 ファイル変更4 行追加0 行削除
  1. 2 0
      local/backend.go
  2. 2 0
      local/backend_test.go

+ 2 - 0
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),
 		},
 	}
 

+ 2 - 0
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)
 }