Updates

quarkusio · Aug 19, 2024 · 3ee34fa · 3ee34fa
1 parent cd05ced
commit 3ee34fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -211,7 +211,7 @@
         <strimzi-oauth.version>0.15.0</strimzi-oauth.version>
         <strimzi-oauth.nimbus.version>9.40</strimzi-oauth.nimbus.version>
         <jose4j.version>0.9.6</jose4j.version>
-        <java-buildpack-client.version>0.0.11</java-buildpack-client.version>
+        <java-buildpack-client.version>0.0.12</java-buildpack-client.version>
         <org-crac.version>0.1.3</org-crac.version>
         <sshd-common.version>2.12.1</sshd-common.version>
         <mime4j.version>0.8.11</mime4j.version>

diff --git a/...oyment/src/main/java/io/quarkus/container/image/buildpack/deployment/BuildpackConfig.java b/...oyment/src/main/java/io/quarkus/container/image/buildpack/deployment/BuildpackConfig.java
@@ -14,7 +14,7 @@ public class BuildpackConfig {
     /**
      * The buildpacks builder image to use when building the project in jvm mode.
      */
-    @ConfigItem(defaultValue = "paketocommunity/builder-ubi-base")
+    @ConfigItem(defaultValue = "paketocommunity/builder-ubi-base:latest")
     public String jvmBuilderImage;
 
     /**

diff --git a/...ent/src/main/java/io/quarkus/container/image/buildpack/deployment/BuildpackProcessor.java b/...ent/src/main/java/io/quarkus/container/image/buildpack/deployment/BuildpackProcessor.java
@@ -182,22 +182,21 @@ private String runBuildpackBuild(BuildpackConfig buildpackConfig,
 
         if (buildContainerImage) {
             log.info("Initiating Buildpack build");
-
             int exitCode = BuildConfig.builder()
                     .addNewFileContentApplication(dirs.get(ProjectDirs.ROOT).toFile())
                     .withOutputImage(new ImageReference(targetImageName))
                     .withNewPlatformConfig()
                     .withEnvironment(envMap)
-                    .and()
+                    .endPlatformConfig()
                     .withNewLogConfig()
                     .withLogger(new BuildpackLogger())
                     .withLogLevel(buildpackConfig.logLevel)
-                    .and()
+                    .endLogConfig()
                     .withNewDockerConfig()
                     .withPullRetryIncreaseSeconds(buildpackConfig.pullTimeoutIncreaseSeconds)
                     .withPullTimeoutSeconds(buildpackConfig.pullTimeoutSeconds)
                     .withPullRetryCount(buildpackConfig.pullRetryCount)
-                    .and()
+                    .endDockerConfig()
                     .accept(BuildConfigBuilder.class, b -> {
                         if (isNativeBuild) {
                             buildpackConfig.nativeBuilderImage.ifPresent(i -> b.withBuilderImage(new ImageReference(i)));
@@ -215,7 +214,7 @@ private String runBuildpackBuild(BuildpackConfig buildpackConfig,
                             b.editDockerConfig().withDockerHost(buildpackConfig.dockerHost.get())
                                     .endDockerConfig();
                         }
-
+                        
                         if (buildpackConfig.trustBuilderImage.isPresent()) {
                             log.info("Setting trusted image to " + buildpackConfig.trustBuilderImage.get());
                             b.editPlatformConfig().withTrustBuilder(buildpackConfig.trustBuilderImage.get())