Merge pull request #179 from maafy6/cpuset

marcuslinke · marcuslinke · commit bc9fa111bd9b · 2015-03-25T20:45:43.000+01:00
Add support for cpuset in CreateContainerCmd
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -62,6 +62,10 @@ public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
 
 	public CreateContainerCmd withCpuShares(int cpuShares);
 
+	public String getCpuset();
+
+	public CreateContainerCmd withCpuset(String cpuset);
+
 	public boolean isAttachStdin();
 
 	public CreateContainerCmd withAttachStdin(boolean attachStdin);
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -32,6 +32,7 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("Memory")       private long      memoryLimit = 0;
     @JsonProperty("MemorySwap")   private long      memorySwap = 0;
     @JsonProperty("CpuShares")    private int       cpuShares = 0;
+    @JsonProperty("Cpuset")       private String    cpuset;
     @JsonProperty("AttachStdin")  private boolean   attachStdin = false;
     @JsonProperty("AttachStdout") private boolean   attachStdout = false;
     @JsonProperty("AttachStderr") private boolean   attachStderr = false;
@@ -202,6 +203,17 @@ public CreateContainerCmdImpl withCpuShares(int cpuShares) {
         return this;
     }
 
+    @Override
+	public String getCpuset() {
+        return cpuset;
+    }
+
+    @Override
+	public CreateContainerCmdImpl withCpuset(String cpuset) {
+        this.cpuset = cpuset;
+        return this;
+    }
+
     @Override
 	public boolean isAttachStdin() {
         return attachStdin;
