diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 13784259da37d..af8e5e9585149 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -27,6 +27,10 @@
jakarta.inject
jakarta.inject-api
+
+ io.smallrye.common
+ smallrye-common-os
+
io.quarkus
quarkus-ide-launcher
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/ContainerRuntimeUtil.java b/core/runtime/src/main/java/io/quarkus/runtime/util/ContainerRuntimeUtil.java
index 2be3cbf76bdaa..33e2e6ef7a70a 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/util/ContainerRuntimeUtil.java
+++ b/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() {
diff --git a/independent-projects/ide-config/src/main/resources/eclipse.importorder b/independent-projects/ide-config/src/main/resources/eclipse.importorder
index 058fb14e630c4..e4322298cbd83 100644
--- a/independent-projects/ide-config/src/main/resources/eclipse.importorder
+++ b/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