Merge pull request #32107 from gsmet/podman.exe

Fix Podman detection on Windows
quarkusio · Mar 27, 2023 · 32ec9f6 · 32ec9f6
2 parents d2efaef + 82e62c7
commit 32ec9f6
Showing 1 changed file with 4 additions and 2 deletions.
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
@@ -77,15 +77,17 @@ public static ContainerRuntime detectContainerRuntime(boolean required) {
             dockerAvailable = dockerVersionOutput.contains("Docker version");
             if (dockerAvailable) {
                 // Check if "docker" is an alias to "podman"
-                if (dockerVersionOutput.startsWith("podman version")) {
+                if (dockerVersionOutput.startsWith("podman version") ||
+                        dockerVersionOutput.startsWith("podman.exe version")) {
                     storeContainerRuntimeInSystemProperty(ContainerRuntime.PODMAN);
                     return ContainerRuntime.PODMAN;
                 }
                 storeContainerRuntimeInSystemProperty(ContainerRuntime.DOCKER);
                 return ContainerRuntime.DOCKER;
             }
             podmanVersionOutput = getVersionOutputFor(ContainerRuntime.PODMAN);
-            podmanAvailable = podmanVersionOutput.startsWith("podman version");
+            podmanAvailable = podmanVersionOutput.startsWith("podman version") ||
+                    podmanVersionOutput.startsWith("podman.exe version");
             if (podmanAvailable) {
                 storeContainerRuntimeInSystemProperty(ContainerRuntime.PODMAN);
                 return ContainerRuntime.PODMAN;