Handle container tool exit code in container-reuse case

olpaw · olpaw · commit 6ca667583045 · 2025-06-05T18:29:14.000+02:00
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ExitStatus.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ExitStatus.java
@@ -40,6 +40,7 @@ public enum ExitStatus {
     DRIVER_TO_BUILDER_ERROR(21),
     WATCHDOG_EXIT(30),
     REBUILD_AFTER_ANALYSIS(40),
+    CONTAINER_REUSE(125),
     MISSING_METADATA(172),
     UNKNOWN(255);
 
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -1770,7 +1770,7 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> cp, LinkedHa
             }
             int exitStatusCode = bundleSupport.containerSupport.initializeImage();
             switch (ExitStatus.of(exitStatusCode)) {
-                case OK -> {
+                case OK, CONTAINER_REUSE -> {
                 }
                 case BUILDER_ERROR -> {
                     /* Exit, builder has handled error reporting. */

Original file line number	Diff line number	Diff line change
`@@ -1770,7 +1770,7 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> cp, LinkedHa`
`1770`	`1770`	`}`
`1771`	`1771`	`int exitStatusCode = bundleSupport.containerSupport.initializeImage();`
`1772`	`1772`	`switch (ExitStatus.of(exitStatusCode)) {`
`1773`		`- case OK -> {`
	`1773`	`+ case OK, CONTAINER_REUSE -> {`
`1774`	`1774`	`}`
`1775`	`1775`	`case BUILDER_ERROR -> {`
`1776`	`1776`	`/* Exit, builder has handled error reporting. */`