Merge pull request #32138 from gsmet/container-runtime-executable

Provide proper Docker executable name on Windows

core/runtime/pom.xml

@@ -27,6 +27,10 @@
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.smallrye.common</groupId>
+            <artifactId>smallrye-common-os</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-ide-launcher</artifactId>

core/runtime/src/main/java/io/quarkus/runtime/util/ContainerRuntimeUtil.java

@@ -12,6 +12,7 @@
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 
+import io.smallrye.common.os.OS;
 import io.smallrye.config.SmallRyeConfig;
 
 public final class ContainerRuntimeUtil {
@@ -192,18 +193,24 @@ private static boolean getRootlessStateFor(ContainerRuntime containerRuntime) {
      * Supported Container runtimes
      */
     public enum ContainerRuntime {
-        DOCKER,
-        PODMAN,
-        UNAVAILABLE;
+        DOCKER("docker" + (OS.current() == OS.WINDOWS ? ".exe" : "")),
+        PODMAN("podman" + (OS.current() == OS.WINDOWS ? ".exe" : "")),
+        UNAVAILABLE(null);
 
         private Boolean rootless;
 
+        private String executableName;
+
+        ContainerRuntime(String executableName) {
+            this.executableName = executableName;
+        }
+
         public String getExecutableName() {
             if (this == UNAVAILABLE) {
                 throw new IllegalStateException("Cannot get an executable name when no container runtime is available");
             }
 
-            return this.name().toLowerCase();
+            return executableName;
         }
 
         public boolean isRootless() {

independent-projects/ide-config/src/main/resources/eclipse.importorder

@@ -2,5 +2,6 @@
 #Wed Jan 23 12:03:29 AEDT 2019
 0=java
 1=javax
-2=org
-3=com
+2=jakarta
+3=org
+4=com