Skip to content

Commit 4633acf

Browse files
committed
Merge pull request #42508 from anthonydahanne
* pr/42508: Use builder-jammy-java-tiny when using Buildpacks Closes gh-42508
2 parents d438271 + 4164139 commit 4633acf

File tree

7 files changed

+13
-11
lines changed

7 files changed

+13
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ 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-tiny:latest`.
36+
NOTE: The CNB builder used for the images is `paketobuildpacks/builder-jammy-java-tiny:latest`.
3737
It has small footprint and reduced attack surface, but you can also use `paketobuildpacks/builder-jammy-base:latest` or `paketobuildpacks/builder-jammy-full:latest` to have more tools available in the image if required.
3838

3939

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-tiny \
69+
$ pack build --builder paketobuildpacks/builder-jammy-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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@
4646
*/
4747
public class BuildRequest {
4848

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

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

5353
static final List<ImageReference> KNOWN_TRUSTED_BUILDERS = List.of(
54+
ImageReference.of("paketobuildpacks/builder-noble-java-tiny"),
55+
ImageReference.of("paketobuildpacks/builder-jammy-java-tiny"),
5456
ImageReference.of("paketobuildpacks/builder-jammy-tiny"),
5557
ImageReference.of("paketobuildpacks/builder-jammy-base"),
5658
ImageReference.of("paketobuildpacks/builder-jammy-full"),

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging-oci-image.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ The following table summarizes the available properties and their default values
119119
| `builder`
120120
| `--builder`
121121
| Name of the builder image to use.
122-
| `paketobuildpacks/builder-jammy-tiny:latest`
122+
| `paketobuildpacks/builder-jammy-java-tiny:latest`
123123

124124
| `trustBuilder`
125125
| `--trustBuilder`
126126
| Whether to treat the builder as https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/concepts/trusted_builders/#what-is-a-trusted-builder[trusted].
127-
| `true` if the builder is one of `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.
127+
| `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.
128128

129129
| `imagePlatform`
130130
| `--imagePlatform`
@@ -251,7 +251,7 @@ NOTE: The plugin detects the target Java compatibility of the project using the
251251
When using the default Paketo builder and buildpacks, the plugin instructs the buildpacks to install the same Java version.
252252
You can override this behavior as shown in the xref:packaging-oci-image.adoc#build-image.examples.builder-configuration[builder configuration] examples.
253253

254-
NOTE: The default builder `paketobuildpacks/builder-jammy-tiny:latest` does not include a shell.
254+
NOTE: The default builder `paketobuildpacks/builder-jammy-java-tiny:latest` does not include a shell.
255255
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, should override the `builder` configuration to use one that includes a shell, such as `paketobuildpacks/builder-jammy-base:latest` or `paketobuildpacks/builder-jammy-full:latest`.
256256

257257

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ void whenUsingDefaultConfigurationThenRequestHasPublishDisabled() {
174174
@Test
175175
void whenNoBuilderIsConfiguredThenRequestHasDefaultBuilder() {
176176
BuildRequest request = this.buildImage.createRequest();
177-
assertThat(request.getBuilder().getName()).isEqualTo("paketobuildpacks/builder-jammy-tiny");
177+
assertThat(request.getBuilder().getName()).isEqualTo("paketobuildpacks/builder-jammy-java-tiny");
178178
assertThat(request.isTrustBuilder()).isTrue();
179179
}
180180

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/build-image.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ The following table summarizes the available parameters and their default values
135135
| `builder` +
136136
(`spring-boot.build-image.builder`)
137137
| Name of the builder image to use.
138-
| `paketobuildpacks/builder-jammy-tiny:latest`
138+
| `paketobuildpacks/builder-jammy-java-tiny:latest`
139139

140140
| `trustBuilder` +
141141
(`spring-boot.build-image.trustBuilder`)
142142
| Whether to treat the builder as https://buildpacks.io/docs/for-platform-operators/how-to/integrate-ci/pack/concepts/trusted_builders/#what-is-a-trusted-builder[trusted].
143-
| `true` if the builder is one of `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.
143+
| `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.
144144

145145
| `imagePlatform` +
146146
(`spring-boot.build-image.imagePlatform`)

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void getBuildRequestWhenNameIsSetUsesName() {
7070
void getBuildRequestWhenNoCustomizationsUsesDefaults() {
7171
BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent());
7272
assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1-SNAPSHOT");
73-
assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-jammy-tiny");
73+
assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-jammy-java-tiny");
7474
assertThat(request.isTrustBuilder()).isTrue();
7575
assertThat(request.getRunImage()).isNull();
7676
assertThat(request.getEnv()).isEmpty();
@@ -108,7 +108,7 @@ void getBuildRequestWhenHasDefaultBuilderAndTrustBuilderUsesTrustBuilder() {
108108
Image image = new Image();
109109
image.trustBuilder = false;
110110
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
111-
assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-jammy-tiny");
111+
assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-jammy-java-tiny");
112112
assertThat(request.isTrustBuilder()).isFalse();
113113
}
114114

0 commit comments

Comments
 (0)