Expression default for quarkus.native.builder-image

radcortez · Jan 14, 2025 · e6a8d2a · e6a8d2a
1 parent f2d0581
commit e6a8d2a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
@@ -256,7 +256,7 @@ interface BuilderImageConfig {
          * {@code quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21}.
          */
         @WithParentName
-        @WithDefault("${platform.quarkus.native.builder-image}")
+        @WithDefault("${platform.quarkus.native.builder-image:mandrel}")
         @ConfigDocDefault("mandrel")
         String image();
 

diff --git a/...adle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java b/...adle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java
@@ -70,9 +70,6 @@ private EffectiveConfig(Builder builder) {
                 .withSources(new YamlConfigSourceLoader.InFileSystem())
                 .withSources(new YamlConfigSourceLoader.InClassPath())
                 .addPropertiesSources()
-                // todo: this is due to ApplicationModel#getPlatformProperties not being included in the effective config
-                .withSources(new PropertiesConfigSource(Map.of("platform.quarkus.native.builder-image", "<<ignored>>"),
-                        "NativeConfig#builderImage", 0))
                 .withDefaultValues(builder.defaultProperties)
                 .withProfile(builder.profile)
                 .withMapping(PackageConfig.class)