Merge pull request #533 from alemousist/master

KostyaSha · KostyaSha · commit a2cde4f89231 · 2016-04-08T21:04:51.000+03:00
Added shmsize build option
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -95,6 +95,12 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     Map<String, String> getBuildArgs();
 
+    /**
+     *@since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @CheckForNull
+    Long getShmsize();
+
     // setters
 
     BuildImageCmd withTag(String tag);
@@ -134,6 +140,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
 
+    /**
+    *@since {@link RemoteApiVersion#VERSION_1_22}
+    */
+    BuildImageCmd withShmsize(Long shmsize);
+
     interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -50,6 +50,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private Long memswap;
 
+    private Long shmsize;
+
     private URI remote;
 
     private Map<String, String> buildArgs;
@@ -159,6 +161,14 @@ public InputStream getTarInputStream() {
         return tarInputStream;
     }
 
+    /**
+     * @see #shmsize
+     */
+    @Override
+    public Long getShmsize() {
+        return shmsize;
+    }
+
     // setters
 
     @Override
@@ -284,6 +294,15 @@ public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
         return this;
     }
 
+    /**
+     * @see #shmsize
+     */
+    @Override
+    public BuildImageCmd withShmsize(Long shmsize) {
+        this.shmsize = shmsize;
+        return this;
+    }
+
     @Override
     public void close() {
         super.close();
@@ -294,4 +313,5 @@ public void close() {
             throw new RuntimeException(e);
         }
     }
+
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -108,6 +108,10 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             }
         }
 
+        if (command.getShmsize() != null) {
+            webTarget = webTarget.queryParam("shmsize", command.getShmsize());
+        }
+
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
         webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -93,6 +93,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             }
         }
 
+        if (command.getShmsize() != null) {
+            webTarget = webTarget.queryParam("shmsize", command.getShmsize());
+        }
+
         LOGGER.trace("POST: {}", webTarget);
 
         InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,10 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ if (command.getShmsize() != null) {`
	`112`	`+ webTarget = webTarget.queryParam("shmsize", command.getShmsize());`
	`113`	`+ }`
	`114`	`+`
`111`	`115`	`webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);`
`112`	`116`	`webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);`
`113`	`117`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
	`96`	`+ if (command.getShmsize() != null) {`
	`97`	`+ webTarget = webTarget.queryParam("shmsize", command.getShmsize());`
	`98`	`+ }`
	`99`	`+`
`96`	`100`	`LOGGER.trace("POST: {}", webTarget);`
`97`	`101`
`98`	`102`	`InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())`