Limit container CPU and memory

openshift · Feb 12, 2016 · 10c7245 · 10c7245
1 parent f5829ce
commit 10c7245
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/pkg/build/builder/common.go b/pkg/build/builder/common.go
@@ -139,13 +139,26 @@ func execPostCommitHook(client DockerClient, postCommitSpec api.BuildPostCommitS
  args = append([]string{script, command[0]}, args...)
  }
 
+ limits, err := GetCGroupLimits()
+ if err != nil {
+ return fmt.Errorf("read cgroup limits: %v", err)
+ }
+
  return dockerRun(client, docker.CreateContainerOptions{
  Name: containerName,
  Config: &docker.Config{
  Image: image,
  Entrypoint: command,
  Cmd: args,
  },
+ HostConfig: &docker.HostConfig{
+ // Limit container's resource allocation.
+ CPUShares: limits.CPUShares,
+ CPUPeriod: limits.CPUPeriod,
+ CPUQuota: limits.CPUQuota,
+ Memory: limits.MemoryLimitBytes,
+ MemorySwap: limits.MemorySwap,
+ },
  }, docker.LogsOptions{
  // Stream logs to stdout and stderr.
  OutputStream: os.Stdout,