From 82e62c76b90ca1ddef93eeaa056d4a93d6a44186 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Fri, 24 Mar 2023 11:03:52 +0100
Subject: [PATCH] Fix Podman detection on Windows

Fixes #32106
---
 .../java/io/quarkus/runtime/util/ContainerRuntimeUtil.java  | 6 ++++--
 1 file changed, 4 insertions(+), 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
index 2be3cbf76bdaa..09ad0d37e7e80 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
@@ -76,7 +76,8 @@ 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;
                 }
@@ -84,7 +85,8 @@ public static ContainerRuntime detectContainerRuntime(boolean required) {
                 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;