Merge pull request #37364 from zakkak/2023-11-28-improve-37242

Improve Docker Desktop detection
quarkusio · Nov 29, 2023 · e4f8d1e · e4f8d1e
2 parents 61edae4 + 5336193
commit e4f8d1e
Showing 1 changed file with 2 additions and 1 deletion.
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
@@ -194,7 +194,8 @@ private static boolean getRootlessStateFor(ContainerRuntime containerRuntime) {
                         // We also treat Docker Desktop as "rootless" since the way it binds mounts does not
                         // transparently map the host user ID and GID
                         // see https://docs.docker.com/desktop/faqs/linuxfaqs/#how-do-i-enable-file-sharing
-                        stringPredicate = line -> line.trim().equals("rootless") || line.contains("desktop-linux");
+                        stringPredicate = line -> line.trim().equals("rootless") || line.contains("Docker Desktop")
+                                || line.contains("desktop-linux");
                     } else {
                         stringPredicate = line -> line.trim().equals("rootless: true");
                     }