If BuildImage fails but logs something about success, don't succeed (… · docker-java/docker-java@4d8c436 · GitHub

1. docker-java
2. docker-java

Repository navigation

• Code
• Issues45 (45)
• Pull requests64 (64)
• Discussions
• Actions
• Projects
• Security and quality
• Insights

Commit 4d8c436

Browse filesBrowse the repository at this point in the historyBrowse files

niloc132

authored

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

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

1 parent 129f786 commit 4d8c436
Copy full SHA for 4d8c436

1 file changed

+5-5Lines changed: 5 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• docker-java-api/src/main/java/com/github/dockerjava/api/command
  • BuildImageResultCallback.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java‎

Copy file name to clipboardExpand all lines: docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java

+5-5Lines changed: 5 additions & 5 deletions

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	}

0 commit comments

Comments

0 (0)