diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/native-image/developing-your-first-application.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/native-image/developing-your-first-application.adoc index c753843f5d..dbe6aa96a0 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/native-image/developing-your-first-application.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/native-image/developing-your-first-application.adoc @@ -33,9 +33,9 @@ This means you can just type a single command and quickly get a sensible image i The resulting image doesn't contain a JVM, instead the native image is compiled statically. This leads to smaller images. -NOTE: The CNB builder used for the images is `paketobuildpacks/builder-jammy-java-tiny:latest`. +NOTE: The CNB builder used for the images is `paketobuildpacks/builder-noble-java-tiny:latest`. It has a small footprint and reduced attack surface. It does not include a shell and contains a reduced set of system libraries. -Use `paketobuildpacks/builder-jammy-base:latest` or `paketobuildpacks/builder-jammy-full:latest` to have more tools available in the image if required. +If you need more tools in the resulting image, you can use `paketobuildpacks/ubuntu-noble-run-base:latest` as the *run* image. diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/packaging/native-image/advanced-topics.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/packaging/native-image/advanced-topics.adoc index 3c833ada4e..cca5ef7c31 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/packaging/native-image/advanced-topics.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/packaging/native-image/advanced-topics.adoc @@ -66,7 +66,7 @@ Assuming an AOT processed Spring Boot executable jar built as `myproject-0.0.1-S [source,shell] ---- -$ pack build --builder paketobuildpacks/builder-jammy-java-tiny \ +$ pack build --builder paketobuildpacks/builder-noble-java-tiny \ --path target/myproject-0.0.1-SNAPSHOT.jar \ --env 'BP_NATIVE_IMAGE=true' \ my-application:0.0.1-SNAPSHOT diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java index 2011bf6a9a..5f20f35254 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java @@ -46,7 +46,7 @@ import org.springframework.util.Assert; */ public class BuildRequest { - static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder-jammy-java-tiny"; + static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder-noble-java-tiny"; static final String DEFAULT_BUILDER_IMAGE_REF = DEFAULT_BUILDER_IMAGE_NAME + ":latest"; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java index aba95aabd2..ea5e5afff4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java @@ -161,8 +161,8 @@ class BootBuildImageIntegrationTests { writeMainClass(); writeLongNameResource(); BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT", - "--imageName=example/test-image-cmd", "--builder=ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1", - "--trustBuilder", "--runImage=paketobuildpacks/run-jammy-tiny", "--createdDate=2020-07-01T12:34:56Z", + "--imageName=example/test-image-cmd", "--builder=ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2", + "--trustBuilder", "--runImage=paketobuildpacks/run-noble-tiny", "--createdDate=2020-07-01T12:34:56Z", "--applicationDirectory=/application"); assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.getOutput()).contains("example/test-image-cmd"); @@ -412,9 +412,9 @@ class BootBuildImageIntegrationTests { void buildsImageOnLinuxArmWithImagePlatformLinuxArm() throws IOException { writeMainClass(); writeLongNameResource(); - String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"; - String runImage = "docker.io/paketobuildpacks/run-jammy-tiny:latest"; - String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.1"; + String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"; + String runImage = "docker.io/paketobuildpacks/run-noble-tiny:latest"; + String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.2"; removeImages(builderImage, runImage, buildpackImage); BuildResult result = this.gradleBuild.build("bootBuildImage"); String projectName = this.gradleBuild.getProjectDir().getName(); @@ -440,9 +440,9 @@ class BootBuildImageIntegrationTests { void failsWhenBuildingOnLinuxAmdWithImagePlatformLinuxArm() throws IOException { writeMainClass(); writeLongNameResource(); - String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"; - String runImage = "docker.io/paketobuildpacks/run-jammy-tiny:latest"; - String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.1"; + String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"; + String runImage = "docker.io/paketobuildpacks/run-noble-tiny:latest"; + String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.2"; removeImages(builderImage, runImage, buildpackImage); BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage"); String projectName = this.gradleBuild.getProjectDir().getName(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageOnLinuxArmWithImagePlatformLinuxArm.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageOnLinuxArmWithImagePlatformLinuxArm.gradle index 5fa10d232d..ea16819a88 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageOnLinuxArmWithImagePlatformLinuxArm.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageOnLinuxArmWithImagePlatformLinuxArm.gradle @@ -4,8 +4,8 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" - runImage = "paketobuildpacks/run-jammy-tiny" - buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"] + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" + runImage = "paketobuildpacks/run-noble-tiny" + buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.2"] imagePlatform = "linux/arm64" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle index 35523d19bd..2aa6a92ac6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle @@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" applicationDirectory = "/application" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle index 2ae1293f2e..e9eeab5db1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" buildWorkspace { bind { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle index c35d5fdced..3260864653 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" as String ] } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle index 9e75218ed3..131cd58efd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" buildpacks = [ "spring-boot/spring-boot-test-info" ] } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle index e3d73369a2..99d3756bdd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" buildpacks = [ "file://${projectDir}/buildpack/hello-world" as String ] } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle index 94964d9ab7..832b0b130f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" buildpacks = [ "file://${projectDir}/hello-world.tgz" as String ] } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle index 9e2c564581..305a8b085a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" - buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"] + buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.2"] } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle index 1114af1ea5..54f11602ac 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCreatedDate.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" createdDate = "2020-07-01T12:34:56Z" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle index b264e85c25..ccfb3aa727 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCurrentCreatedDate.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" createdDate = "now" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle index 30e56a4c60..d52cec77dc 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle @@ -5,7 +5,7 @@ plugins { bootBuildImage { imageName = "example/test-image-custom" - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" - runImage = "paketobuildpacks/run-jammy-tiny" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" + runImage = "paketobuildpacks/run-noble-tiny" pullPolicy = "IF_NOT_PRESENT" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle index d43e7897bb..9e9ef9253e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle @@ -5,6 +5,6 @@ plugins { bootBuildImage { imageName = "example/test-image-name" - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle index ca92d1b2d2..93deb5469e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithEmptySecurityOptions.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" securityOptions = [] } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle index ae6e69667a..43244b2fa8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithLaunchScript.gradle @@ -8,6 +8,6 @@ bootJar { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle index f630f5247c..87500543f4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithNetworkModeNone.gradle @@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" network = "none" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle index 3151af716c..f8b50f215b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle @@ -10,6 +10,6 @@ if (project.hasProperty('applyWarPlugin')) { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = PullPolicy.ALWAYS } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle index a45b3de7fe..3f4337c96b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTag.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" tags = [ "example.com/myapp:latest" ] } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTrustBuilder.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTrustBuilder.gradle index 27136227b0..56109db1ff 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTrustBuilder.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithTrustBuilder.gradle @@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" trustBuilder = true pullPolicy = "IF_NOT_PRESENT" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle index 0073c9a5d8..f25753a1fa 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithVolumeCaches.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" buildWorkspace { volume { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle index 39a8a5dd6a..1d3e7d8579 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" archiveFile = bootWar.archiveFile -} \ No newline at end of file +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenBuildingOnLinuxAmdWithImagePlatformLinuxArm.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenBuildingOnLinuxAmdWithImagePlatformLinuxArm.gradle index 5fa10d232d..ea16819a88 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenBuildingOnLinuxAmdWithImagePlatformLinuxArm.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenBuildingOnLinuxAmdWithImagePlatformLinuxArm.gradle @@ -4,8 +4,8 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" - runImage = "paketobuildpacks/run-jammy-tiny" - buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"] + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" + runImage = "paketobuildpacks/run-noble-tiny" + buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.2"] imagePlatform = "linux/arm64" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle index 8b2051aac7..8c10e4ba32 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWhenCachesAreConfiguredTwice.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" buildCache { volume { name = "build-cache-volume" diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle index d869f8bcbf..f0d79f1ce1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" environment = ["FORCE_FAILURE": "true"] } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle index 0b25b2a2a8..0a3851d8cf 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ] } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle index 7afdedfb00..504fbc50d0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidCreatedDate.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" createdDate = "invalid date" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle index 186a5f23b4..616a5bb9d5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithInvalidTag.gradle @@ -4,7 +4,7 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" tags = [ "example/Invalid-Tag-Name" ] } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle index e23d844d06..40e1c23a6f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle @@ -8,6 +8,6 @@ if (project.hasProperty('applyWarPlugin')) { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" pullPolicy = "IF_NOT_PRESENT" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle index c30e89c9b9..ca7a307cfd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.gradle @@ -4,6 +4,6 @@ plugins { } bootBuildImage { - builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" + builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2" publish = true } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging-oci-image.adoc b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging-oci-image.adoc index 2f3026504e..92dfb77043 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging-oci-image.adoc +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging-oci-image.adoc @@ -119,12 +119,12 @@ The following table summarizes the available properties and their default values | `builder` | `--builder` | Name of the builder image to use. -| `paketobuildpacks/builder-jammy-java-tiny:latest` +| `paketobuildpacks/builder-noble-java-tiny:latest` | `trustBuilder` | `--trustBuilder` | Whether to treat the builder as {url-buildpacks-docs}/for-platform-operators/how-to/integrate-ci/pack/concepts/trusted_builders/#what-is-a-trusted-builder[trusted]. -| `true` if the builder is one of `paketobuildpacks/builder-jammy-java-tiny`, `paketobuildpacks/builder-noble-java-tiny`, `paketobuildpacks/builder-jammy-tiny`, `paketobuildpacks/builder-jammy-base`, `paketobuildpacks/builder-jammy-full`, `paketobuildpacks/builder-jammy-buildpackless-tiny`, `paketobuildpacks/builder-jammy-buildpackless-base`, `paketobuildpacks/builder-jammy-buildpackless-full`, `gcr.io/buildpacks/builder`, `heroku/builder`; `false` otherwise. +| `true` if the builder is one of `paketobuildpacks/builder-noble-java-tiny`, `paketobuildpacks/builder-jammy-java-tiny`, `paketobuildpacks/builder-jammy-tiny`, `paketobuildpacks/builder-jammy-base`, `paketobuildpacks/builder-jammy-full`, `paketobuildpacks/builder-jammy-buildpackless-tiny`, `paketobuildpacks/builder-jammy-buildpackless-base`, `paketobuildpacks/builder-jammy-buildpackless-full`, `gcr.io/buildpacks/builder`, `heroku/builder`; `false` otherwise. | `imagePlatform` | `--imagePlatform` @@ -251,8 +251,8 @@ NOTE: The plugin detects the target Java compatibility of the project using the When using the default Paketo builder and buildpacks, the plugin instructs the buildpacks to install the same Java version. You can override this behavior as shown in the xref:packaging-oci-image.adoc#build-image.examples.builder-configuration[builder configuration] examples. -NOTE: The default builder `paketobuildpacks/builder-jammy-java-tiny:latest` contains a reduced set of system libraries and does not include a shell. -Applications that require a shell to run a start script, as might be the case when the {url-gradle-docs-application-plugin}[`application` plugin] has been applied to generate a distribution zip archive, or that depend upon a system library that is not present, should override the `builder` configuration to use one that includes a shell and a broader set of system libraries, such as `paketobuildpacks/builder-jammy-base:latest` or `paketobuildpacks/builder-jammy-full:latest`. +NOTE: The default builder `paketobuildpacks/builder-noble-java-tiny:latest` contains a reduced set of system libraries and does not include a shell. +Applications that require a shell to run a start script, as might be the case when the {url-gradle-docs-application-plugin}[`application` plugin] has been applied to generate a distribution zip archive, or that depend upon a system library that is not present, should override the `runImage` configuration to use one that includes a shell and a broader set of system libraries, such as `paketobuildpacks/ubuntu-noble-run-base:latest`. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java index af17cf6e28..08387a9a1b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java @@ -174,7 +174,7 @@ class BootBuildImageTests { @Test void whenNoBuilderIsConfiguredThenRequestHasDefaultBuilder() { BuildRequest request = this.buildImage.createRequest(); - assertThat(request.getBuilder().getName()).isEqualTo("paketobuildpacks/builder-jammy-java-tiny"); + assertThat(request.getBuilder().getName()).isEqualTo("paketobuildpacks/builder-noble-java-tiny"); assertThat(request.isTrustBuilder()).isTrue(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java index 7519cd3261..3df58ef01c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java @@ -270,9 +270,9 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { .goals("package") .systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT") .systemProperty("spring-boot.build-image.imageName", "example.com/test/cmd-property-name:v1") - .systemProperty("spring-boot.build-image.builder", "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1") + .systemProperty("spring-boot.build-image.builder", "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2") .systemProperty("spring-boot.build-image.trustBuilder", "true") - .systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run-jammy-tiny") + .systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run-noble-tiny") .systemProperty("spring-boot.build-image.createdDate", "2020-07-01T12:34:56Z") .systemProperty("spring-boot.build-image.applicationDirectory", "/application") .execute((project) -> { @@ -540,9 +540,9 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @EnabledOnOs(value = { OS.LINUX, OS.MAC }, architectures = "aarch64", disabledReason = "Lifecycle will only run on ARM architecture") void whenBuildImageIsInvokedOnLinuxArmWithImagePlatformLinuxArm(MavenBuild mavenBuild) throws IOException { - String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"; - String runImage = "docker.io/paketobuildpacks/run-jammy-tiny:latest"; - String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.1"; + String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"; + String runImage = "docker.io/paketobuildpacks/run-noble-tiny:latest"; + String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.2"; removeImages(builderImage, runImage, buildpackImage); mavenBuild.project("dockerTest", "build-image-platform-linux-arm").goals("package").execute((project) -> { File jar = new File(project, "target/build-image-platform-linux-arm-0.0.1.BUILD-SNAPSHOT.jar"); @@ -564,9 +564,9 @@ class BuildImageTests extends AbstractArchiveIntegrationTests { @EnabledOnOs(value = { OS.LINUX, OS.MAC }, architectures = "amd64", disabledReason = "The expected failure condition will not fail on ARM architectures") void failsWhenBuildImageIsInvokedOnLinuxAmdWithImagePlatformLinuxArm(MavenBuild mavenBuild) throws IOException { - String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"; - String runImage = "docker.io/paketobuildpacks/run-jammy-tiny:latest"; - String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.1"; + String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"; + String runImage = "docker.io/paketobuildpacks/run-noble-tiny:latest"; + String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.2"; removeImages(buildpackImage, runImage, buildpackImage); mavenBuild.project("dockerTest", "build-image-platform-linux-arm") .goals("package") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-app-dir/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-app-dir/pom.xml index 03e500bd46..fcefc85da1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-app-dir/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-app-dir/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 /application diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bad-buildpack/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bad-buildpack/pom.xml index 36310c7e5c..465d137ff9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bad-buildpack/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bad-buildpack/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 urn:cnb:builder:example/does-not-exist:0.0.1 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bind-caches/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bind-caches/pom.xml index fad4b3aa24..45efa20586 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bind-caches/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bind-caches/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 ${java.io.tmpdir}/junit-image-cache-${test-build-id}-work diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/pom.xml index 515524ab8d..8991ace398 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-bindings/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 ${basedir}/bindings/ca-certificates:/platform/bindings/ca-certificates diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-builder-error/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-builder-error/pom.xml index d521c0b527..c7f7c026e0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-builder-error/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-builder-error/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 true diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-caches-multiple/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-caches-multiple/pom.xml index 6b7b75b49d..ec992757ee 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-caches-multiple/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-caches-multiple/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 build-cache-volume1 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source-with-repackage/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source-with-repackage/pom.xml index d2686d7950..1839f73247 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source-with-repackage/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source-with-repackage/pom.xml @@ -45,7 +45,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source/pom.xml index 8aed373bcf..2793215f60 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-source/pom.xml @@ -39,7 +39,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-with-repackage/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-with-repackage/pom.xml index ff3c44348a..0a380c42cd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-with-repackage/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier-with-repackage/pom.xml @@ -29,7 +29,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier/pom.xml index dedb7d0143..89383ef371 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-classifier/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-cmd-line/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-cmd-line/pom.xml index 00bfc63500..1f4fa916f7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-cmd-line/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-cmd-line/pom.xml @@ -19,7 +19,7 @@ @project.version@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-created-date/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-created-date/pom.xml index 225122fcc2..99d65403d9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-created-date/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-created-date/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 2020-07-01T12:34:56Z diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-current-created-date/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-current-created-date/pom.xml index ca445f400f..7f38caea98 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-current-created-date/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-current-created-date/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 now diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-builder/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-builder/pom.xml index a404e10815..734097d672 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-builder/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-builder/pom.xml @@ -23,8 +23,8 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 - paketobuildpacks/run-jammy-tiny + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 + paketobuildpacks/run-noble-tiny diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-buildpacks/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-buildpacks/pom.xml index 949533432a..85a767bf7f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-buildpacks/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-buildpacks/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 urn:cnb:builder:spring-boot/spring-boot-test-info diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-name/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-name/pom.xml index 50b294e92b..c893db4e93 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-name/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-custom-name/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 example.com/test/build-image:${project.version} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-empty-env-entry/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-empty-env-entry/pom.xml index ee5cd38208..f021d584e0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-empty-env-entry/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-empty-env-entry/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-final-name/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-final-name/pom.xml index 7254dddfdf..0c957692c6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-final-name/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-final-name/pom.xml @@ -25,7 +25,7 @@ final-name - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-fork-classifier/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-fork-classifier/pom.xml index 37e4caa7d4..75d41feeaf 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-fork-classifier/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-fork-classifier/pom.xml @@ -27,7 +27,7 @@ exec - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/app/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/app/pom.xml index 536e027bb9..f75f393b10 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/app/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-multi-module/app/pom.xml @@ -31,7 +31,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-network/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-network/pom.xml index 6e975034b5..7f0f6e245e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-network/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-network/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 none diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-platform-linux-arm/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-platform-linux-arm/pom.xml index 8b477431b5..a91c8d00a7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-platform-linux-arm/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-platform-linux-arm/pom.xml @@ -23,10 +23,10 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 - paketobuildpacks/run-jammy-tiny + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 + paketobuildpacks/run-noble-tiny - ghcr.io/spring-io/spring-boot-test-info:0.0.1 + ghcr.io/spring-io/spring-boot-test-info:0.0.2 linux/arm64 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-publish/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-publish/pom.xml index 627043f4dd..0f791a64de 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-publish/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-publish/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 true diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-security-opts/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-security-opts/pom.xml index 00ceb05474..889eb558a9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-security-opts/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-security-opts/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-tags/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-tags/pom.xml index ffa74844e7..df398ae421 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-tags/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-tags/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 ${project.artifactId}:latest diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-trust-builder/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-trust-builder/pom.xml index dd847d1a34..3faf83444b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-trust-builder/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-trust-builder/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 true diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-volume-caches/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-volume-caches/pom.xml index e0de774f19..6f10a57f99 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-volume-caches/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-volume-caches/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 cache-${test-build-id}.work diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-war-packaging/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-war-packaging/pom.xml index 6f0fe67b03..8328fbcf85 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-war-packaging/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-war-packaging/pom.xml @@ -24,7 +24,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-with-repackage/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-with-repackage/pom.xml index 0d3aa5a307..ceeb96f4e1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-with-repackage/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-with-repackage/pom.xml @@ -29,7 +29,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-zip-packaging/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-zip-packaging/pom.xml index 29fb2782f0..55b81788b1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-zip-packaging/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image-zip-packaging/pom.xml @@ -26,7 +26,7 @@ ZIP - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image/pom.xml index 5264475c03..de6cd0b4be 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/projects/build-image/pom.xml @@ -23,7 +23,7 @@ - ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1 + ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/build-image.adoc b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/build-image.adoc index 66d108c829..7e37f8d36d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/build-image.adoc +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/build-image.adoc @@ -135,12 +135,12 @@ The following table summarizes the available parameters and their default values | `builder` + (`spring-boot.build-image.builder`) | Name of the builder image to use. -| `paketobuildpacks/builder-jammy-java-tiny:latest` +| `paketobuildpacks/builder-noble-java-tiny:latest` | `trustBuilder` + (`spring-boot.build-image.trustBuilder`) | Whether to treat the builder as {url-buildpacks-docs}/for-platform-operators/how-to/integrate-ci/pack/concepts/trusted_builders/#what-is-a-trusted-builder[trusted]. -| `true` if the builder is one of `paketobuildpacks/builder-jammy-java-tiny`, `paketobuildpacks/builder-noble-java-tiny`, `paketobuildpacks/builder-jammy-tiny`, `paketobuildpacks/builder-jammy-base`, `paketobuildpacks/builder-jammy-full`, `paketobuildpacks/builder-jammy-buildpackless-tiny`, `paketobuildpacks/builder-jammy-buildpackless-base`, `paketobuildpacks/builder-jammy-buildpackless-full`, `gcr.io/buildpacks/builder`, `heroku/builder`; `false` otherwise. +| `true` if the builder is one of `paketobuildpacks/builder-noble-java-tiny`, `paketobuildpacks/builder-jammy-java-tiny`, `paketobuildpacks/builder-jammy-tiny`, `paketobuildpacks/builder-jammy-base`, `paketobuildpacks/builder-jammy-full`, `paketobuildpacks/builder-jammy-buildpackless-tiny`, `paketobuildpacks/builder-jammy-buildpackless-base`, `paketobuildpacks/builder-jammy-buildpackless-full`, `gcr.io/buildpacks/builder`, `heroku/builder`; `false` otherwise. | `imagePlatform` + (`spring-boot.build-image.imagePlatform`) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java index 126fec3866..309c2467f2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java @@ -71,7 +71,7 @@ class ImageTests { void getBuildRequestWhenNoCustomizationsUsesDefaults() { BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent()); assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1-SNAPSHOT"); - assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-jammy-java-tiny"); + assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-noble-java-tiny"); assertThat(request.isTrustBuilder()).isTrue(); assertThat(request.getRunImage()).isNull(); assertThat(request.getEnv()).isEmpty(); @@ -109,7 +109,7 @@ class ImageTests { Image image = new Image(); image.trustBuilder = false; BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent()); - assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-jammy-java-tiny"); + assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-noble-java-tiny"); assertThat(request.isTrustBuilder()).isFalse(); } diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java index c505c9ffaa..5e79906edc 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2024 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -278,9 +278,9 @@ class PaketoBuilderTests { "paketo-buildpacks/apache-tomcat", "paketo-buildpacks/dist-zip", "paketo-buildpacks/spring-boot"); metadata.processOfType("web") - .containsSubsequence("java", "org.apache.catalina.startup.Bootstrap", "start"); + .containsSubsequence("sh", "/layers/paketo-buildpacks_apache-tomcat/tomcat/bin/catalina.sh", "run"); metadata.processOfType("tomcat") - .containsSubsequence("java", "org.apache.catalina.startup.Bootstrap", "start"); + .containsSubsequence("sh", "/layers/paketo-buildpacks_apache-tomcat/tomcat/bin/catalina.sh", "run"); }); assertImageHasJvmSbomLayer(imageReference, config); assertImageHasDependenciesSbomLayer(imageReference, config, "apache-tomcat"); diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle index ae6aa12063..17c1d590fd 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle @@ -39,6 +39,5 @@ application { bootBuildImage { archiveFile = bootDistZip.archiveFile - builder = "paketobuildpacks/builder-jammy-base:latest" environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()] -} \ No newline at end of file +} diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle index 27e413ca61..e0a8299668 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle @@ -39,6 +39,6 @@ application { bootBuildImage { archiveFile = distZip.archiveFile - builder = "paketobuildpacks/builder-jammy-base:latest" + runImage = "paketobuildpacks/ubuntu-noble-run-base:latest" environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()] -} \ No newline at end of file +} diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle index de62bba099..2c9f76af9c 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle @@ -32,5 +32,6 @@ war { bootBuildImage { archiveFile = war.archiveFile + runImage = "paketobuildpacks/ubuntu-noble-run-base:latest" environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion(), 'BP_TOMCAT_VERSION': '10.*'] } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/Ubuntu/jammy-20240227/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/Ubuntu/jammy/Dockerfile similarity index 100% rename from spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/Ubuntu/jammy-20240227/Dockerfile rename to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/Ubuntu/jammy/Dockerfile diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/Ubuntu/noble/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/Ubuntu/noble/Dockerfile new file mode 100644 index 0000000000..8da019058b --- /dev/null +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/conf/Ubuntu/noble/Dockerfile @@ -0,0 +1,11 @@ +FROM ubuntu:noble-20250404 as prepare +COPY downloads/* /opt/download/ +RUN mkdir -p /opt/jdk && \ + cd /opt/jdk && \ + tar xzf /opt/download/* --strip-components=1 + +FROM ubuntu:noble-20250404 +RUN apt-get update && apt-get install -y software-properties-common curl +COPY --from=prepare /opt/jdk /opt/jdk +ENV JAVA_HOME /opt/jdk +ENV PATH $JAVA_HOME/bin:$PATH diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile index 66f48c4ed9..33977a8656 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20231211.1 +FROM ubuntu:noble-20250404 RUN apt-get update && \ apt-get install -y software-properties-common curl && \ mkdir -p /opt/oraclejdk && \ diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64 b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64 index f463770a33..7e4a5cceeb 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64 +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64 @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20231211.1 +FROM ubuntu:noble-20250404 RUN apt-get update && \ apt-get install -y software-properties-common curl && \ mkdir -p /opt/oraclejdk && \ diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile index 5f648c5eb0..34615d91bb 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/resources/conf/oracle-jdk-17/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:jammy-20240405 as prepare +FROM ubuntu:noble-20250404 as prepare COPY downloads/* /opt/download/ RUN mkdir -p /opt/jdk && \ cd /opt/jdk && \ tar xzf /opt/download/* --strip-components=1 -FROM ubuntu:jammy-20240405 +FROM ubuntu:noble-20250404 COPY --from=prepare /opt/jdk /opt/jdk ENV JAVA_HOME /opt/jdk ENV PATH $JAVA_HOME/bin:$PATH diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/src/intTest/java/org/springframework/boot/sni/SniIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/src/intTest/java/org/springframework/boot/sni/SniIntegrationTests.java index 8140199551..350ad59a07 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/src/intTest/java/org/springframework/boot/sni/SniIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/src/intTest/java/org/springframework/boot/sni/SniIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2024 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -106,7 +106,7 @@ class SniIntegrationTests { protected ApplicationContainer(String appName, String fileSuffix, String... entryPointArgs) { super(new ImageFromDockerfile().withFileFromFile("spring-boot.jar", findJarFile(appName, fileSuffix)) - .withDockerfileFromBuilder((builder) -> builder.from("eclipse-temurin:17-jre-jammy") + .withDockerfileFromBuilder((builder) -> builder.from("eclipse-temurin:17-jre-noble") .add("spring-boot.jar", "/spring-boot.jar") .entryPoint(buildEntryPoint(entryPointArgs)))); withExposedPorts(SERVER_PORT);