Skip to content

Commit 1ec3a06

Browse files
committed
[GR-48106] Handle container tool exit code in container-reuse case.
PullRequest: graal/21029
2 parents 10b40a0 + 947493c commit 1ec3a06

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ExitStatus.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public enum ExitStatus {
4040
DRIVER_TO_BUILDER_ERROR(21),
4141
WATCHDOG_EXIT(30),
4242
REBUILD_AFTER_ANALYSIS(40),
43+
// podman can exit 125 if container does not need building
44+
CONTAINER_REUSE(125),
4345
MISSING_METADATA(172),
4446
UNKNOWN(255);
4547

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1770,7 +1770,7 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> cp, LinkedHa
17701770
}
17711771
int exitStatusCode = bundleSupport.containerSupport.initializeImage();
17721772
switch (ExitStatus.of(exitStatusCode)) {
1773-
case OK -> {
1773+
case OK, CONTAINER_REUSE -> {
17741774
}
17751775
case BUILDER_ERROR -> {
17761776
/* Exit, builder has handled error reporting. */

0 commit comments

Comments
 (0)