@@ -138,15 +138,13 @@ func (c *builderConfig) execute(b builder) error {

 	}

 	gitClient := git.NewRepositoryWithEnv(gitEnv)

-	/*

-		cgLimits, err := bld.GetCGroupLimits()

-		if err != nil {

-			return fmt.Errorf("failed to retrieve cgroup limits: %v", err)

-		}

-		glog.V(2).Infof("Running build with cgroup limits: %#v", *cgLimits)

-	*/

+	cgLimits, err := bld.GetCGroupLimits()

+	if err != nil {

+		return fmt.Errorf("failed to retrieve cgroup limits: %v", err)

+	}

+	glog.V(2).Infof("Running build with cgroup limits: %#v", *cgLimits)

-	if err := b.Build(c.dockerClient, c.dockerEndpoint, c.buildsClient, c.build, gitClient, nil); err != nil {

+	if err := b.Build(c.dockerClient, c.dockerEndpoint, c.buildsClient, c.build, gitClient, cgLimits); err != nil {

 		return fmt.Errorf("build error: %v", err)

 	}

@@ -144,12 +144,11 @@ 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)

-		}

-	*/

+	limits, err := GetCGroupLimits()

+	if err != nil {

+		return fmt.Errorf("read cgroup limits: %v", err)

+	}

+

 	return dockerRun(client, docker.CreateContainerOptions{

 		Name: containerName,

 		Config: &docker.Config{

@@ -158,14 +157,12 @@ func execPostCommitHook(client DockerClient, postCommitSpec api.BuildPostCommitS

 			Cmd:        args,

 		},

 		HostConfig: &docker.HostConfig{

-		// Limit container's resource allocation.

-		/*

+			// 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.