@@ -215,6 +215,7 @@ func populateCommand(c *Container, env []string) error {

 		Memory:     c.Config.Memory,

 		MemorySwap: c.Config.MemorySwap,

 		CpuShares:  c.Config.CpuShares,

+		Cpuset:     c.Config.Cpuset,

 	}

 	c.command = &execdriver.Command{

 		ID:         c.ID,

@@ -103,9 +103,10 @@ type NetworkInterface struct {

 }

 type Resources struct {

-	Memory     int64 `json:"memory"`

-	MemorySwap int64 `json:"memory_swap"`

-	CpuShares  int64 `json:"cpu_shares"`

+	Memory     int64  `json:"memory"`

+	MemorySwap int64  `json:"memory_swap"`

+	CpuShares  int64  `json:"cpu_shares"`

+	Cpuset     string `json:"cpuset"`

 }

 type Mount struct {

@@ -127,6 +127,9 @@ lxc.cgroup.memory.memsw.limit_in_bytes = {{$memSwap}}

 {{if .Resources.CpuShares}}

 lxc.cgroup.cpu.shares = {{.Resources.CpuShares}}

 {{end}}

+{{if .Resources.Cpuset}}

+lxc.cgroup.cpuset.cpus = {{.Resources.Cpuset}}

+{{end}}

 {{end}}

 {{if .Config.lxc}}

@@ -117,6 +117,7 @@ func (d *driver) setupCgroups(container *libcontainer.Container, c *execdriver.C

 		container.Cgroups.Memory = c.Resources.Memory

 		container.Cgroups.MemoryReservation = c.Resources.Memory

 		container.Cgroups.MemorySwap = c.Resources.MemorySwap

+		container.Cgroups.CpusetCpus = c.Resources.Cpuset

 	}

 	return nil

 }

@@ -811,6 +811,7 @@ Run a command in a new container

     -a, --attach=[]            Attach to stdin, stdout or stderr.

     -c, --cpu-shares=0         CPU shares (relative weight)

+    --cpuset=""                CPUs in which to allow execution (0-3, 0,1)

     --cidfile=""               Write the container ID to the file

     -d, --detach=false         Detached mode: Run container in the background, print new container id

     --dns=[]                   Set custom dns servers

@@ -768,3 +768,14 @@ func TestProcWritableInPrivilegedContainers(t *testing.T) {

 	logDone("run - proc writable in privileged container")

 }

+

+func TestRunWithCpuset(t *testing.T) {

+	cmd := exec.Command(dockerBinary, "run", "--cpuset", "0", "busybox", "true")

+	if code, err := runCommand(cmd); err != nil || code != 0 {

+		t.Fatalf("container should run successfuly with cpuset of 0: %s", err)

+	}

+

+	deleteAllContainers()

+

+	logDone("run - cpuset 0")

+}

@@ -12,9 +12,10 @@ type Config struct {

 	Hostname        string

 	Domainname      string

 	User            string

-	Memory          int64 // Memory limit (in bytes)

-	MemorySwap      int64 // Total memory usage (memory + swap); set `-1' to disable swap

-	CpuShares       int64 // CPU shares (relative weight vs. other containers)

+	Memory          int64  // Memory limit (in bytes)

+	MemorySwap      int64  // Total memory usage (memory + swap); set `-1' to disable swap

+	CpuShares       int64  // CPU shares (relative weight vs. other containers)

+	Cpuset          string // Cpuset 0-2, 0,1

 	AttachStdin     bool

 	AttachStdout    bool

 	AttachStderr    bool

@@ -41,6 +42,7 @@ func ContainerConfigFromJob(job *engine.Job) *Config {

 		Memory:          job.GetenvInt64("Memory"),

 		MemorySwap:      job.GetenvInt64("MemorySwap"),

 		CpuShares:       job.GetenvInt64("CpuShares"),

+		Cpuset:          job.Getenv("Cpuset"),

 		AttachStdin:     job.GetenvBool("AttachStdin"),

 		AttachStdout:    job.GetenvBool("AttachStdout"),

 		AttachStderr:    job.GetenvBool("AttachStderr"),

@@ -63,6 +63,7 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf

 		flUser            = cmd.String([]string{"u", "-user"}, "", "Username or UID")

 		flWorkingDir      = cmd.String([]string{"w", "-workdir"}, "", "Working directory inside the container")

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

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

 		flNetMode         = cmd.String([]string{"-net"}, "bridge", "Set the Network mode for the container\n'bridge': creates a new network stack for the container on the docker bridge\n'none': no networking for this container\n'container:<name|id>': reuses another container network stack\n'host': use the host network stack inside the contaner")

 		// For documentation purpose

 		_ = cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxify all received signal to the process (even in non-tty mode)")

@@ -219,6 +220,7 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf

 		OpenStdin:       *flStdin,

 		Memory:          flMemory,

 		CpuShares:       *flCpuShares,

+		Cpuset:          *flCpuset,

 		AttachStdin:     flAttach.Get("stdin"),

 		AttachStdout:    flAttach.Get("stdout"),

 		AttachStderr:    flAttach.Get("stderr"),