Fix support for quiet option in BuildImageCmd (docker-java#1318)

orzeh · web-flow · commit aec7efa56445 · 2020-02-14T11:58:54.000+01:00
Fixes docker-java#1246
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -9,6 +9,7 @@ public class BuildResponseItem extends ResponseItem {
     private static final long serialVersionUID = -1252904184236343612L;
 
     private static final String BUILD_SUCCESS = "Successfully built";
+    private static final String SHA256 = "sha256:";
 
     /**
      * Returns whether the stream field indicates a successful build operation
@@ -19,7 +20,7 @@ public boolean isBuildSuccessIndicated() {
             return false;
         }
 
-        return getStream().contains(BUILD_SUCCESS);
+        return getStream().contains(BUILD_SUCCESS) || getStream().startsWith(SHA256);
     }
 
     @JsonIgnore
@@ -28,6 +29,10 @@ public String getImageId() {
             return null;
         }
 
+        if (getStream().startsWith(SHA256)) {
+            return getStream().replaceFirst(SHA256, "").trim();
+        }
+
         return getStream().replaceFirst(BUILD_SUCCESS, "").trim();
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -39,6 +39,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -317,6 +318,22 @@ public void cacheFrom() throws Exception {
 
     }
 
+    @Test
+    public void quiet() {
+        File baseDir = fileFromBuildTestResource("labels");
+
+        String imageId = dockerRule.getClient()
+                .buildImageCmd(baseDir)
+                .withQuiet(true)
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        assertThat(inspectImageResponse.getId(), endsWith(imageId));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+    }
+
     public void dockerfileNotInBaseDirectory() throws Exception {
         File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
         File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ public class BuildResponseItem extends ResponseItem {`
`9`	`9`	`private static final long serialVersionUID = -1252904184236343612L;`
`10`	`10`
`11`	`11`	`private static final String BUILD_SUCCESS = "Successfully built";`
	`12`	`+ private static final String SHA256 = "sha256:";`
`12`	`13`
`13`	`14`	`/**`
`14`	`15`	`* Returns whether the stream field indicates a successful build operation`
`@@ -19,7 +20,7 @@ public boolean isBuildSuccessIndicated() {`
`19`	`20`	`return false;`
`20`	`21`	`}`
`21`	`22`
`22`		`- return getStream().contains(BUILD_SUCCESS);`
	`23`	`+ return getStream().contains(BUILD_SUCCESS) \|\| getStream().startsWith(SHA256);`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`@JsonIgnore`
`@@ -28,6 +29,10 @@ public String getImageId() {`
`28`	`29`	`return null;`
`29`	`30`	`}`
`30`	`31`
	`32`	`+ if (getStream().startsWith(SHA256)) {`
	`33`	`+ return getStream().replaceFirst(SHA256, "").trim();`
	`34`	`+ }`
	`35`	`+`
`31`	`36`	`return getStream().replaceFirst(BUILD_SUCCESS, "").trim();`
`32`	`37`	`}`
`33`	`38`	`}`