From 6870c6ab484d51c5f3a484317a37a99e871e570a Mon Sep 17 00:00:00 2001 From: Alejandro Mousist Date: Wed, 30 Mar 2016 17:15:13 -0300 Subject: [PATCH 1/2] Added shmsize build option --- .../dockerjava/api/command/BuildImageCmd.java | 5 +++++ .../dockerjava/core/command/BuildImageCmdImpl.java | 14 ++++++++++++++ .../github/dockerjava/jaxrs/BuildImageCmdExec.java | 4 ++++ .../dockerjava/netty/exec/BuildImageCmdExec.java | 4 ++++ 4 files changed, 27 insertions(+) diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java index d11c86c7f..84f4e42c5 100644 --- 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,9 @@ public interface BuildImageCmd extends AsyncDockerCmd getBuildArgs(); + @CheckForNull + long getShmsize(); + // setters BuildImageCmd withTag(String tag); @@ -134,6 +137,8 @@ public interface BuildImageCmd extends AsyncDockerCmd { } diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java index ef57e84a4..d5a42f7a3 100644 --- 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 buildArgs; @@ -159,6 +161,11 @@ public InputStream getTarInputStream() { return tarInputStream; } + @Override + public long getShmsize() { + return shmsize; + } + // setters @Override @@ -284,6 +291,12 @@ public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) { return this; } + @Override + public BuildImageCmd withShmsize(long shmsize) { + this.shmsize = shmsize; + return this; + } + @Override public void close() { super.close(); @@ -294,4 +307,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 index dc642f1a6..c94946e7e 100644 --- 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 callbackNotifier(BuildImag } } + if (command.getShmsize() != 0) { + 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 index 155ceef6a..bf1be4713 100644 --- 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 } } + if (command.getShmsize() != 0) { + webTarget = webTarget.queryParam("shmsize", command.getShmsize()); + } + LOGGER.trace("POST: {}", webTarget); InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request()) From 8c7e12caf1d29c821d51dec29c7305afe9984fa2 Mon Sep 17 00:00:00 2001 From: Alejandro Mousist Date: Wed, 30 Mar 2016 23:10:04 -0300 Subject: [PATCH 2/2] Code style/design for shmsize build option (API v1_22) --- .../github/dockerjava/api/command/BuildImageCmd.java | 10 ++++++++-- .../dockerjava/core/command/BuildImageCmdImpl.java | 12 +++++++++--- .../github/dockerjava/jaxrs/BuildImageCmdExec.java | 2 +- .../dockerjava/netty/exec/BuildImageCmdExec.java | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java index 84f4e42c5..20b23e903 100644 --- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java +++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java @@ -95,8 +95,11 @@ public interface BuildImageCmd extends AsyncDockerCmd getBuildArgs(); + /** + *@since {@link RemoteApiVersion#VERSION_1_22} + */ @CheckForNull - long getShmsize(); + Long getShmsize(); // setters @@ -137,7 +140,10 @@ public interface BuildImageCmd extends AsyncDockerCmd { } diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java index d5a42f7a3..58f148cb6 100644 --- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java +++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java @@ -50,7 +50,7 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd callbackNotifier(BuildImag } } - if (command.getShmsize() != 0) { + if (command.getShmsize() != null) { webTarget = webTarget.queryParam("shmsize", command.getShmsize()); } diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java index bf1be4713..f4ff04576 100644 --- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java +++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java @@ -93,7 +93,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback } } - if (command.getShmsize() != 0) { + if (command.getShmsize() != null) { webTarget = webTarget.queryParam("shmsize", command.getShmsize()); }