Ability to set container shm size (docker-java#659)

selslack · KostyaSha · commit f355e6e75658 · 2016-08-11T01:31:06.000+03:00
* Added setShmSize option to 'create container' command

* Changed shmSize type to Long

* Exposed hostConfig
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.LxcConf;
@@ -187,6 +188,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     String getPidMode();
 
+    @CheckForNull
+    HostConfig getHostConfig();
+
     @CheckForNull
     String getCgroupParent();
 
@@ -436,6 +440,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      */
     CreateContainerCmd withPidMode(String pidMode);
 
+    CreateContainerCmd withHostConfig(HostConfig hostConfig);
+
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -190,7 +190,7 @@ public class HostConfig {
      * @since {@link RemoteApiVersion#VERSION_1_22}
      */
     @JsonProperty("ShmSize")
-    private String shmSize;
+    private Long shmSize;
 
 
     @JsonIgnore
@@ -401,7 +401,7 @@ public String getCgroupParent() {
      * @see #shmSize
      */
     @CheckForNull
-    public String getShmSize() {
+    public Long getShmSize() {
         return shmSize;
     }
 
@@ -764,7 +764,7 @@ public HostConfig withSecurityOpts(List<String> securityOpts) {
     /**
      * @see #shmSize
      */
-    public HostConfig withShmSize(String shmSize) {
+    public HostConfig withShmSize(Long shmSize) {
         this.shmSize = shmSize;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -472,6 +472,11 @@ public String getPidMode() {
         return hostConfig.getPidMode();
     }
 
+    @Override
+    public HostConfig getHostConfig() {
+        return hostConfig;
+    }
+
     @Override
     public String getCgroupParent() {
         return hostConfig.getCgroupParent();
@@ -976,6 +981,12 @@ public CreateContainerCmd withPidMode(String pidMode) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
+        this.hostConfig = hostConfig;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.Network;
@@ -21,6 +22,7 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+import org.apache.commons.io.FileUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -735,4 +737,20 @@ public void createContainerWithCgroupParent() throws DockerException {
 
         assertThat(inspectContainer.getHostConfig().getCgroupParent(), is("/parent"));
     }
+
+    @SuppressWarnings("Duplicates")
+    @Test
+    public void createContainerWithShmSize() throws DockerException {
+        HostConfig hostConfig = new HostConfig().withShmSize(96 * FileUtils.ONE_MB);
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+            .withHostConfig(hostConfig).withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertEquals(inspectContainerResponse.getHostConfig().getShmSize(), hostConfig.getShmSize());
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -9,6 +9,7 @@
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.Network;
@@ -20,6 +21,7 @@
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
+import org.apache.commons.io.FileUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -676,4 +678,20 @@ public void createContainerWithCgroupParent() throws DockerException {
 
         assertThat(inspectContainer.getHostConfig().getCgroupParent(), is("/parent"));
     }
+
+    @SuppressWarnings("Duplicates")
+    @Test
+    public void createContainerWithShmSize() throws DockerException {
+        HostConfig hostConfig = new HostConfig().withShmSize(96 * FileUtils.ONE_MB);
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+            .withHostConfig(hostConfig).withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertEquals(inspectContainerResponse.getHostConfig().getShmSize(), hostConfig.getShmSize());
+    }
 }
