ConfigProvider.getConfig() different classloader issue

Author: Karm

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java

@@ -1,6 +1,7 @@
 package io.quarkus.deployment.pkg.steps;
 
 import static io.quarkus.deployment.pkg.steps.LinuxIDUtil.getLinuxID;
+import static io.quarkus.runtime.util.ContainerRuntimeUtil.detectContainerRuntime;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,7 +14,6 @@
 import java.util.function.BooleanSupplier;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 
 import io.quarkus.bootstrap.util.IoUtils;
@@ -38,8 +38,7 @@ public class AppCDSBuildStep {
     public static final String CLASSES_LIST_FILE_NAME = "classes.lst";
     private static final String CONTAINER_IMAGE_BASE_BUILD_DIR = "/tmp/quarkus";
     private static final String CONTAINER_IMAGE_APPCDS_DIR = CONTAINER_IMAGE_BASE_BUILD_DIR + "/appcds";
-    public static final String DOCKER_EXECUTABLE = ConfigProvider.getConfig()
-            .getOptionalValue("quarkus.native.container-runtime", String.class).orElse("docker");
+    public static final String DOCKER_EXECUTABLE = detectContainerRuntime().getExecutableName();
 
     @BuildStep(onlyIf = AppCDSRequired.class)
     public void requested(OutputTargetBuildItem outputTarget, BuildProducer<AppCDSRequestedBuildItem> producer)

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

@@ -11,9 +11,13 @@
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 
+import io.smallrye.config.SmallRyeConfig;
+
 public final class ContainerRuntimeUtil {
 
     private static final Logger log = Logger.getLogger(ContainerRuntimeUtil.class);
+    private static final String DOCKER_EXECUTABLE = ConfigProvider.getConfig().unwrap(SmallRyeConfig.class)
+            .getOptionalValue("quarkus.native.container-runtime", String.class).orElse(null);
 
     private ContainerRuntimeUtil() {
     }
@@ -32,13 +36,10 @@ public static ContainerRuntime detectContainerRuntime() {
         // podman version 2.1.1
         String podmanVersionOutput = getVersionOutputFor(ContainerRuntime.PODMAN);
         boolean podmanAvailable = podmanVersionOutput.startsWith("podman version");
-
-        final String executable = ConfigProvider.getConfig()
-                .getOptionalValue("quarkus.native.container-runtime", String.class).orElse(null);
-        if (executable != null) {
-            if (executable.trim().equalsIgnoreCase("docker") && dockerAvailable) {
+        if (DOCKER_EXECUTABLE != null) {
+            if (DOCKER_EXECUTABLE.trim().equalsIgnoreCase("docker") && dockerAvailable) {
                 return ContainerRuntime.DOCKER;
-            } else if (executable.trim().equalsIgnoreCase("podman") && podmanAvailable) {
+            } else if (DOCKER_EXECUTABLE.trim().equalsIgnoreCase("podman") && podmanAvailable) {
                 return ContainerRuntime.PODMAN;
             } else {
                 log.warn("quarkus.native.container-runtime config property must be set to either podman or docker " +

test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java

@@ -1,5 +1,6 @@
 package io.quarkus.test.junit;
 
+import static io.quarkus.runtime.util.ContainerRuntimeUtil.detectContainerRuntime;
 import static io.quarkus.test.common.PathTestHelper.getAppClassLocationForTestLocation;
 import static io.quarkus.test.common.PathTestHelper.getTestClassesLocation;
 import static java.lang.ProcessBuilder.Redirect.DISCARD;
@@ -34,7 +35,6 @@
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.jandex.Index;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -64,9 +64,7 @@ public final class IntegrationTestUtil {
     public static final int DEFAULT_PORT = 8081;
     public static final int DEFAULT_HTTPS_PORT = 8444;
     public static final long DEFAULT_WAIT_TIME_SECONDS = 60;
-
-    private static final String DOCKER_BINARY = ConfigProvider.getConfig()
-            .getOptionalValue("quarkus.native.container-runtime", String.class).orElse("docker");
+    private static final String DOCKER_BINARY = detectContainerRuntime().getExecutableName();
 
     private IntegrationTestUtil() {
     }