Skip to content

Commit e4f8d1e

Browse files
authored
Merge pull request #37364 from zakkak/2023-11-28-improve-37242
Improve Docker Desktop detection
2 parents 61edae4 + 5336193 commit e4f8d1e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ private static boolean getRootlessStateFor(ContainerRuntime containerRuntime) {
194194
// We also treat Docker Desktop as "rootless" since the way it binds mounts does not
195195
// transparently map the host user ID and GID
196196
// see https://docs.docker.com/desktop/faqs/linuxfaqs/#how-do-i-enable-file-sharing
197-
stringPredicate = line -> line.trim().equals("rootless") || line.contains("desktop-linux");
197+
stringPredicate = line -> line.trim().equals("rootless") || line.contains("Docker Desktop")
198+
|| line.contains("desktop-linux");
198199
} else {
199200
stringPredicate = line -> line.trim().equals("rootless: true");
200201
}

0 commit comments

Comments
 (0)