Support for build-args of docker build

alenkacz · alenkacz · commit 95caffad742b · 2015-12-19T15:58:36.000+01:00
In 1.9 there is new property - build-args that can be specified for
docker build command
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.InputStream;
 import java.net.URI;
+import java.util.Map;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
@@ -87,6 +88,9 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     public String getCpusetcpus();
 
+    @CheckForNull
+    public Map<String, String> getBuildArgs();
+
     // setters
 
     public BuildImageCmd withTag(String tag);
@@ -115,6 +119,8 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withCpusetcpus(String cpusetcpus);
 
+    public BuildImageCmd withBuildArg(String key, String value);
+
     // setters lib specific
 
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -6,6 +6,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
 
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
@@ -50,6 +52,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private URI remote;
 
+    private Map<String, String> buildArgs = new HashMap<String, String>();
+
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
     }
@@ -138,6 +142,11 @@ public String getCpusetcpus() {
         return cpusetcpus;
     }
 
+    @Override
+    public Map<String, String> getBuildArgs() {
+        return buildArgs;
+    }
+
     // getter lib specific
 
     @Override
@@ -219,6 +228,12 @@ public BuildImageCmd withCpusetcpus(String cpusetcpus) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withBuildArg(String key, String value) {
+        this.buildArgs.put(key, value);
+        return this;
+    }
+
     // lib specific
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -6,6 +6,7 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.RequestEntityProcessing;
 import org.slf4j.Logger;
@@ -20,9 +21,12 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
+import java.io.IOException;
+
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         super(baseResource, dockerClientConfig);
@@ -88,6 +92,18 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus());
         }
 
+        if (command.hasRemoveEnabled() == null || !command.hasRemoveEnabled()) {
+            webTarget = webTarget.queryParam("rm", "false");
+        }
+
+        if (command.getBuildArgs() != null) {
+            try {
+                webTarget = webTarget.queryParam("buildargs", MAPPER.writeValueAsString(command.getBuildArgs()));
+            } catch (IOException e) {
+                // pass
+            }
+        }
+
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
         webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
 
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -304,4 +304,18 @@ public void testBuildFromPrivateRegistry() throws Exception {
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
     }
+
+    @Test
+    public void testBuildArgs() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildArgs").getFile());
+
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc").exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
+    }
 }
diff --git a/src/test/resources/testBuildArgs/Dockerfile b/src/test/resources/testBuildArgs/Dockerfile
@@ -0,0 +1,5 @@
+FROM      ubuntu:latest
+
+ARG testArg
+
+LABEL "test"=$testArg
