Bugfixes

Author: dominikmascherbauer

substratevm/mx.substratevm/mx_substratevm.py

@@ -1016,6 +1016,7 @@ def _native_image_launcher_extra_jvm_args():
     '--features=com.oracle.svm.driver.APIOptionFeature',
     '--initialize-at-build-time=com.oracle.svm.driver',
     '--link-at-build-time=com.oracle.svm.driver,com.oracle.svm.driver.metainf',
+    '-H:IncludeResources=com/oracle/svm/driver/launcher/.*',
 ] + svm_experimental_options([
     '-H:-ParseRuntimeOptions',
 ])
@@ -1056,9 +1057,7 @@ def _native_image_launcher_extra_jvm_args():
             destination="bin/<exe:native-image>",
             jar_distributions=["substratevm:SVM_DRIVER"],
             main_class=_native_image_launcher_main_class(),
-            build_args=driver_build_args + [
-                '-H:IncludeResources=com/oracle/svm/driver/launcher/.*',
-            ],
+            build_args=driver_build_args,
             extra_jvm_args=_native_image_launcher_extra_jvm_args(),
             home_finder=False,
         ),

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

@@ -786,7 +786,7 @@ private Path writeBundle() {
                     createDockerfile(dockerfilePath);
                 }
             } else if (!dockerfilePath.equals(containerSupport.dockerfile)) {
-                Files.copy(containerSupport.dockerfile, dockerfilePath);
+                Files.copy(containerSupport.dockerfile, dockerfilePath, StandardCopyOption.REPLACE_EXISTING);
             }
         } catch (IOException e) {
             throw NativeImage.showError("Failed to write bundle-file " + dockerfilePath, e);