@@ -55,6 +55,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 	flMemoryString := cmd.String([]string{"m", "-memory"}, "", "Memory limit")

 	flMemorySwap := cmd.String([]string{"-memory-swap"}, "", "Total memory (memory + swap), '-1' to disable swap")

 	flCPUShares := cmd.Int64([]string{"c", "-cpu-shares"}, 0, "CPU shares (relative weight)")

+	flCpuQuota := cmd.Int64([]string{"-cpu-quota"}, 0, "Limit the CPU CFS (Completely Fair Scheduler) quota")

 	flCPUSetCpus := cmd.String([]string{"-cpuset-cpus"}, "", "CPUs in which to allow execution (0-3, 0,1)")

 	flCPUSetMems := cmd.String([]string{"-cpuset-mems"}, "", "MEMs in which to allow execution (0-3, 0,1)")

@@ -281,6 +282,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 	v.Set("cpusetcpus", *flCPUSetCpus)

 	v.Set("cpusetmems", *flCPUSetMems)

 	v.Set("cpushares", strconv.FormatInt(*flCPUShares, 10))

+	v.Set("cpuquota", strconv.FormatInt(*flCpuQuota, 10))

 	v.Set("memory", strconv.FormatInt(memory, 10))

 	v.Set("memswap", strconv.FormatInt(memorySwap, 10))

@@ -1343,6 +1343,7 @@ func (s *Server) postBuild(eng *engine.Engine, version version.Version, w http.R

 	buildConfig.MemorySwap = int64Value(r, "memswap")

 	buildConfig.Memory = int64Value(r, "memory")

 	buildConfig.CpuShares = int64Value(r, "cpushares")

+	buildConfig.CpuQuota = int64Value(r, "cpuquota")

 	buildConfig.CpuSetCpus = r.FormValue("cpusetcpus")

 	buildConfig.CpuSetMems = r.FormValue("cpusetmems")

@@ -124,6 +124,7 @@ type Builder struct {

 	cpuSetCpus string

 	cpuSetMems string

 	cpuShares  int64

+	cpuQuota   int64

 	memory     int64

 	memorySwap int64

@@ -547,6 +547,7 @@ func (b *Builder) create() (*daemon.Container, error) {

 	hostConfig := &runconfig.HostConfig{

 		CpuShares:  b.cpuShares,

+		CpuQuota:   b.cpuQuota,

 		CpusetCpus: b.cpuSetCpus,

 		CpusetMems: b.cpuSetMems,

 		Memory:     b.memory,

@@ -49,6 +49,7 @@ type Config struct {

 	Memory         int64

 	MemorySwap     int64

 	CpuShares      int64

+	CpuQuota       int64

 	CpuSetCpus     string

 	CpuSetMems     string

 	AuthConfig     *cliconfig.AuthConfig

@@ -169,6 +170,7 @@ func Build(d *daemon.Daemon, buildConfig *Config) error {

 		ConfigFile:      buildConfig.ConfigFile,

 		dockerfileName:  buildConfig.DockerfileName,

 		cpuShares:       buildConfig.CpuShares,

+		cpuQuota:        buildConfig.CpuQuota,

 		cpuSetCpus:      buildConfig.CpuSetCpus,

 		cpuSetMems:      buildConfig.CpuSetMems,

 		memory:          buildConfig.Memory,

@@ -279,7 +279,7 @@ _docker_build() {

 	case "$cur" in

 		-*)

-			COMPREPLY=( $( compgen -W "--cpu-shares -c --cpuset-cpus --file -f --force-rm --help --memory -m --memory-swap --no-cache --pull --quiet -q --rm --tag -t" -- "$cur" ) )

+			COMPREPLY=( $( compgen -W "--cpu-shares -c --cpuset-cpus --cpu-quota --file -f --force-rm --help --memory -m --memory-swap --no-cache --pull --quiet -q --rm --tag -t" -- "$cur" ) )

 			;;

 		*)

 			local counter="$(__docker_pos_first_nonflag '--tag|-t')"

@@ -17,6 +17,7 @@ docker-build - Build a new image from the source code at PATH

 [**-m**|**--memory**[=*MEMORY*]]

 [**--memory-swap**[=*MEMORY-SWAP*]]

 [**-c**|**--cpu-shares**[=*0*]]

+[**--cpu-quota**[=*0*]]

 [**--cpuset-cpus**[=*CPUSET-CPUS*]]

 PATH | URL | -

@@ -5371,7 +5371,7 @@ func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *check.C) {

 		c.Fatal(err)

 	}

-	cmd := exec.Command(dockerBinary, "build", "--no-cache", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpuset-mems=0", "--cpu-shares=100", "-t", name, ".")

+	cmd := exec.Command(dockerBinary, "build", "--no-cache", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpuset-mems=0", "--cpu-shares=100", "--cpu-quota=8000", "-t", name, ".")

 	cmd.Dir = ctx.Dir

 	out, _, err := runCommandWithOutput(cmd)

@@ -5388,6 +5388,7 @@ func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *check.C) {

 		CpusetCpus string

 		CpusetMems string

 		CpuShares  int64

+		CpuQuota   int64

 	}

 	cfg, err := inspectFieldJSON(cID, "HostConfig")

@@ -5399,9 +5400,9 @@ func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *check.C) {

 	if err := json.Unmarshal([]byte(cfg), &c1); err != nil {

 		c.Fatal(err, cfg)

 	}

-	if c1.Memory != 67108864 || c1.MemorySwap != -1 || c1.CpusetCpus != "0" || c1.CpusetMems != "0" || c1.CpuShares != 100 {

-		c.Fatalf("resource constraints not set properly:\nMemory: %d, MemSwap: %d, CpusetCpus: %s, CpusetMems: %s, CpuShares: %d",

-			c1.Memory, c1.MemorySwap, c1.CpusetCpus, c1.CpusetMems, c1.CpuShares)

+	if c1.Memory != 67108864 || c1.MemorySwap != -1 || c1.CpusetCpus != "0" || c1.CpusetMems != "0" || c1.CpuShares != 100 || c1.CpuQuota != 8000 {

+		c.Fatalf("resource constraints not set properly:\nMemory: %d, MemSwap: %d, CpusetCpus: %s, CpusetMems: %s, CpuShares: %d, CpuQuota: %d",

+			c1.Memory, c1.MemorySwap, c1.CpusetCpus, c1.CpusetMems, c1.CpuShares, c1.CpuQuota)

 	}

 	// Make sure constraints aren't saved to image

@@ -5415,9 +5416,9 @@ func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *check.C) {

 	if err := json.Unmarshal([]byte(cfg), &c2); err != nil {

 		c.Fatal(err, cfg)

 	}

-	if c2.Memory == 67108864 || c2.MemorySwap == -1 || c2.CpusetCpus == "0" || c2.CpusetMems == "0" || c2.CpuShares == 100 {

-		c.Fatalf("resource constraints leaked from build:\nMemory: %d, MemSwap: %d, CpusetCpus: %s, CpusetMems: %s, CpuShares: %d",

-			c2.Memory, c2.MemorySwap, c2.CpusetCpus, c2.CpusetMems, c2.CpuShares)

+	if c2.Memory == 67108864 || c2.MemorySwap == -1 || c2.CpusetCpus == "0" || c2.CpusetMems == "0" || c2.CpuShares == 100 || c2.CpuQuota == 8000 {

+		c.Fatalf("resource constraints leaked from build:\nMemory: %d, MemSwap: %d, CpusetCpus: %s, CpusetMems: %s, CpuShares: %d, CpuQuota: %d",

+			c2.Memory, c2.MemorySwap, c2.CpusetCpus, c2.CpusetMems, c2.CpuShares, c2.CpuQuota)

 	}

 }