Skip to content

Commit 0fb369e

Browse files
committed
Use paketobuildpacks/builder-noble-java-tiny as the default image builder
Closes gh-42711
1 parent 29e0865 commit 0fb369e

File tree

78 files changed

+122
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+122
-111
lines changed

spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/native-image/developing-your-first-application.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ This means you can just type a single command and quickly get a sensible image i
3333
The resulting image doesn't contain a JVM, instead the native image is compiled statically.
3434
This leads to smaller images.
3535

36-
NOTE: The CNB builder used for the images is `paketobuildpacks/builder-jammy-java-tiny:latest`.
36+
NOTE: The CNB builder used for the images is `paketobuildpacks/builder-noble-java-tiny:latest`.
3737
It has a small footprint and reduced attack surface. It does not include a shell and contains a reduced set of system libraries.
38-
Use `paketobuildpacks/builder-jammy-base:latest` or `paketobuildpacks/builder-jammy-full:latest` to have more tools available in the image if required.
38+
If you need more tools in the resulting image, you can use `paketobuildpacks/ubuntu-noble-run-base:latest` as the *run* image.
3939

4040

4141

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/packaging/native-image/advanced-topics.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Assuming an AOT processed Spring Boot executable jar built as `myproject-0.0.1-S
6666

6767
[source,shell]
6868
----
69-
$ pack build --builder paketobuildpacks/builder-jammy-java-tiny \
69+
$ pack build --builder paketobuildpacks/builder-noble-java-tiny \
7070
--path target/myproject-0.0.1-SNAPSHOT.jar \
7171
--env 'BP_NATIVE_IMAGE=true' \
7272
my-application:0.0.1-SNAPSHOT

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
*/
4747
public class BuildRequest {
4848

49-
static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder-jammy-java-tiny";
49+
static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder-noble-java-tiny";
5050

5151
static final String DEFAULT_BUILDER_IMAGE_REF = DEFAULT_BUILDER_IMAGE_NAME + ":latest";
5252

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ void buildsImageWithCommandLineOptions() throws IOException {
161161
writeMainClass();
162162
writeLongNameResource();
163163
BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT",
164-
"--imageName=example/test-image-cmd", "--builder=ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1",
165-
"--trustBuilder", "--runImage=paketobuildpacks/run-jammy-tiny", "--createdDate=2020-07-01T12:34:56Z",
164+
"--imageName=example/test-image-cmd", "--builder=ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2",
165+
"--trustBuilder", "--runImage=paketobuildpacks/run-noble-tiny", "--createdDate=2020-07-01T12:34:56Z",
166166
"--applicationDirectory=/application");
167167
assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
168168
assertThat(result.getOutput()).contains("example/test-image-cmd");
@@ -412,9 +412,9 @@ void buildsImageWithEmptySecurityOptions() throws IOException {
412412
void buildsImageOnLinuxArmWithImagePlatformLinuxArm() throws IOException {
413413
writeMainClass();
414414
writeLongNameResource();
415-
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1";
416-
String runImage = "docker.io/paketobuildpacks/run-jammy-tiny:latest";
417-
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.1";
415+
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2";
416+
String runImage = "docker.io/paketobuildpacks/run-noble-tiny:latest";
417+
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.2";
418418
removeImages(builderImage, runImage, buildpackImage);
419419
BuildResult result = this.gradleBuild.build("bootBuildImage");
420420
String projectName = this.gradleBuild.getProjectDir().getName();
@@ -440,9 +440,9 @@ void buildsImageOnLinuxArmWithImagePlatformLinuxArm() throws IOException {
440440
void failsWhenBuildingOnLinuxAmdWithImagePlatformLinuxArm() throws IOException {
441441
writeMainClass();
442442
writeLongNameResource();
443-
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1";
444-
String runImage = "docker.io/paketobuildpacks/run-jammy-tiny:latest";
445-
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.1";
443+
String builderImage = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2";
444+
String runImage = "docker.io/paketobuildpacks/run-noble-tiny:latest";
445+
String buildpackImage = "ghcr.io/spring-io/spring-boot-test-info:0.0.2";
446446
removeImages(builderImage, runImage, buildpackImage);
447447
BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage");
448448
String projectName = this.gradleBuild.getProjectDir().getName();

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageOnLinuxArmWithImagePlatformLinuxArm.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
8-
runImage = "paketobuildpacks/run-jammy-tiny"
9-
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"]
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
8+
runImage = "paketobuildpacks/run-noble-tiny"
9+
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.2"]
1010
imagePlatform = "linux/arm64"
1111
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithApplicationDirectory.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if (project.hasProperty('applyWarPlugin')) {
88
}
99

1010
bootBuildImage {
11-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
11+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
1212
pullPolicy = "IF_NOT_PRESENT"
1313
applicationDirectory = "/application"
1414
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBindCaches.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildWorkspace {
1010
bind {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" as String ]
1010
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildpacks = [ "spring-boot/spring-boot-test-info" ]
1010
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.2"
88
pullPolicy = "IF_NOT_PRESENT"
99
buildpacks = [ "file://${projectDir}/buildpack/hello-world" as String ]
1010
}

0 commit comments

Comments
 (0)