Merge pull request #1160 from mattupstate/build-target-support

KostyaSha · web-flow · commit 6c5898b6521f · 2019-03-09T07:20:39.000+03:00
Add support for target parameter in BuildImgCmd
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -140,6 +140,12 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     String getPlatform();
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_38}
+     */
+    @CheckForNull
+    String getTarget();
+
     // setters
 
     /**
@@ -213,6 +219,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
      */
     BuildImageCmd withPlatform(String platform);
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_38}
+     */
+    BuildImageCmd withTarget(String target);
+
     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
@@ -70,6 +70,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private String platform;
 
+    private String target;
+
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
     }
@@ -191,6 +193,11 @@ public String getPlatform() {
         return platform;
     }
 
+    @Override
+    public String getTarget() {
+        return target;
+    }
+
     // getter lib specific
 
     @Override
@@ -389,6 +396,12 @@ public BuildImageCmd withPlatform(String platform) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
     @Override
     public void close() {
         super.close();
diff --git a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -113,6 +113,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             webTarget = webTarget.queryParam("platform", command.getPlatform());
         }
 
+        if (command.getTarget() != null) {
+            webTarget = webTarget.queryParam("target", command.getTarget());
+        }
+
         LOGGER.trace("POST: {}", webTarget);
 
         InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -128,6 +128,10 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             webTarget = webTarget.queryParam("platform", command.getPlatform());
         }
 
+        if (command.getTarget() != null) {
+            webTarget = webTarget.queryParam("target", command.getTarget());
+        }
+
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
         webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
 

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>`
`113`	`113`	`webTarget = webTarget.queryParam("platform", command.getPlatform());`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ if (command.getTarget() != null) {`
	`117`	`+ webTarget = webTarget.queryParam("target", command.getTarget());`
	`118`	`+ }`
	`119`	`+`
`116`	`120`	`LOGGER.trace("POST: {}", webTarget);`
`117`	`121`
`118`	`122`	`InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,10 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag`
`128`	`128`	`webTarget = webTarget.queryParam("platform", command.getPlatform());`
`129`	`129`	`}`
`130`	`130`
	`131`	`+ if (command.getTarget() != null) {`
	`132`	`+ webTarget = webTarget.queryParam("target", command.getTarget());`
	`133`	`+ }`
	`134`	`+`
`131`	`135`	`webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);`
`132`	`136`	`webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);`
`133`	`137`