If BuildImage fails but logs something about success, don't succeed (#2305)

niloc132 · web-flow · commit 4d8c436d6cbe · 2024-02-26T13:19:07.000-05:00
This patch ensures that if the docker build commands result in logging the string "Successfully built", the callback from that build will still fail if there was an error in building. Fixes #2184
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java
@@ -67,14 +67,14 @@ public String awaitImageId(long timeout, TimeUnit timeUnit) {
     }
 
     private String getImageId() {
-        if (imageId != null) {
-            return imageId;
+        if (error != null) {
+            throw new DockerClientException("Could not build image: " + error);
         }
 
-        if (error == null) {
-            throw new DockerClientException("Could not build image");
+        if (imageId != null) {
+            return imageId;
         }
 
-        throw new DockerClientException("Could not build image: " + error);
+        throw new DockerClientException("Could not build image");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -67,14 +67,14 @@ public String awaitImageId(long timeout, TimeUnit timeUnit) {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`private String getImageId() {`
`70`		`- if (imageId != null) {`
`71`		`- return imageId;`
	`70`	`+ if (error != null) {`
	`71`	`+ throw new DockerClientException("Could not build image: " + error);`
`72`	`72`	`}`
`73`	`73`
`74`		`- if (error == null) {`
`75`		`- throw new DockerClientException("Could not build image");`
	`74`	`+ if (imageId != null) {`
	`75`	`+ return imageId;`
`76`	`76`	`}`
`77`	`77`
`78`		`- throw new DockerClientException("Could not build image: " + error);`
	`78`	`+ throw new DockerClientException("Could not build image");`
`79`	`79`	`}`
`80`	`80`	`}`