Merge pull request #38644 from geoand/#38616

Fix AppCDS generation when using podman
quarkusio · Feb 7, 2024 · 90f1c28 · 90f1c28
2 parents 7fb6adb + 692a640
commit 90f1c28
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java
@@ -194,11 +194,18 @@ private List<String> dockerRunCommands(OutputTargetBuildItem outputTarget, Strin
         command.add(outputTarget.getOutputDirectory().toAbsolutePath().toString() + ":" + CONTAINER_IMAGE_BASE_BUILD_DIR
                 + ":z");
         if (SystemUtils.IS_OS_LINUX) {
-            String uid = getLinuxID("-ur");
-            String gid = getLinuxID("-gr");
-            if (uid != null && gid != null && !uid.isEmpty() && !gid.isEmpty()) {
-                command.add("--user");
-                command.add(uid + ":" + gid);
+            if (containerRuntime.isDocker() && containerRuntime.isRootless()) {
+                Collections.addAll(command, "--user", String.valueOf(0));
+            } else {
+                String uid = getLinuxID("-ur");
+                String gid = getLinuxID("-gr");
+                if (uid != null && gid != null && !uid.isEmpty() && !gid.isEmpty()) {
+                    Collections.addAll(command, "--user", uid + ":" + gid);
+                    if (containerRuntime.isPodman() && containerRuntime.isRootless()) {
+                        // Needed to avoid AccessDeniedExceptions
+                        command.add("--userns=keep-id");
+                    }
+                }
             }
         }
         command.add("-w");