Merge pull request #1022 from Baqend/issue-818-support-tmpfs

KostyaSha · web-flow · commit 29770e2d2dcc · 2018-04-17T18:34:43.000+03:00
Issue 818 support tmpfs
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -14,6 +14,7 @@
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Used in `/containers/create`, and in inspect container.
@@ -206,6 +207,12 @@ public class HostConfig implements Serializable {
     @JsonProperty("Runtime")
     private String runtime;
 
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("Tmpfs")
+    private Map<String, String> tmpFs;
+
     @JsonIgnore
     public Bind[] getBinds() {
         return (binds == null) ? new Bind[0] : binds.getBinds();
@@ -434,6 +441,14 @@ public Long getPidsLimit() {
         return pidsLimit;
     }
 
+    /**
+     * @see #tmpFs
+     */
+    @CheckForNull
+    public Map<String, String> getTmpFs() {
+        return tmpFs;
+    }
+
     /**
      * Parse the network mode as specified at
      * {@see https://github.com/docker/engine-api/blob/master/types/container/hostconfig_unix.go}
@@ -830,6 +845,15 @@ public HostConfig withRuntime(String runtime) {
         this.runtime = runtime;
         return this;
     }
+
+    /**
+     * @see #tmpFs
+     */
+    public HostConfig withTmpFs(Map<String, String> tmpFs) {
+        this.tmpFs = tmpFs;
+        return this;
+    }
+
     // end of auto-generated
 
     @Override
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -40,6 +40,7 @@
 import java.io.File;
 import java.security.SecureRandom;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -866,4 +867,14 @@ public void createContainerFromPrivateRegistryWithNoAuth() throws Exception {
                 .exec();
     }
 
+    @Test
+    public void createContainerWithTmpFs() throws DockerException {
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
+                .withHostConfig(new HostConfig().withTmpFs(Collections.singletonMap("/tmp", "rw,noexec,nosuid,size=50m"))).exec();
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getHostConfig().getTmpFs().get("/tmp"), equalTo("rw,noexec,nosuid,size=50m"));
+    }
 }
