Skip to content

Commit d1cce0f

Browse files
Upgrade default CNB builders to Paketo Jammy
Closes gh-38477
1 parent 95fbb49 commit d1cce0f

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

ci/pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ resources:
191191
type: registry-image
192192
icon: docker
193193
source:
194-
repository: paketobuildpacks/builder
195-
tag: base
194+
repository: paketobuildpacks/builder-jammy-base
195+
tag: latest
196196
- name: artifactory-repo
197197
type: artifactory-resource
198198
icon: package-variant

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
@@ -43,7 +43,7 @@
4343
*/
4444
public class BuildRequest {
4545

46-
static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder:base";
46+
static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder-jammy-base:latest";
4747

4848
private static final ImageReference DEFAULT_BUILDER = ImageReference.of(DEFAULT_BUILDER_IMAGE_NAME);
4949

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ The following table summarizes the available properties and their default values
105105
| `builder`
106106
| `--builder`
107107
| Name of the Builder image to use.
108-
| `paketobuildpacks/builder:base`
108+
| `paketobuildpacks/builder-jammy-base:latest`
109109

110110
| `runImage`
111111
| `--runImage`

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ void whenUsingDefaultConfigurationThenRequestHasPublishDisabled() {
194194

195195
@Test
196196
void whenNoBuilderIsConfiguredThenRequestHasDefaultBuilder() {
197-
assertThat(this.buildImage.createRequest().getBuilder().getName()).isEqualTo("paketobuildpacks/builder");
197+
assertThat(this.buildImage.createRequest().getBuilder().getName())
198+
.isEqualTo("paketobuildpacks/builder-jammy-base");
198199
}
199200

200201
@Test

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ The following table summarizes the available parameters and their default values
115115
| `builder` +
116116
(`spring-boot.build-image.builder`)
117117
| Name of the Builder image to use.
118-
| `paketobuildpacks/builder:base`
118+
| `paketobuildpacks/builder-jammy-base:latest`
119119

120120
| `runImage` +
121121
(`spring-boot.build-image.runImage`)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@ class ImageTests {
5252
@Test
5353
void getBuildRequestWhenNameIsNullDeducesName() {
5454
BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent());
55-
assertThat(request.getName().toString()).isEqualTo("docker.io/library/my-app:0.0.1-SNAPSHOT");
55+
assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1-SNAPSHOT");
5656
}
5757

5858
@Test
5959
void getBuildRequestWhenNameIsSetUsesName() {
6060
Image image = new Image();
6161
image.name = "demo";
6262
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
63-
assertThat(request.getName().toString()).isEqualTo("docker.io/library/demo:latest");
63+
assertThat(request.getName()).hasToString("docker.io/library/demo:latest");
6464
}
6565

6666
@Test
6767
void getBuildRequestWhenNoCustomizationsUsesDefaults() {
6868
BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent());
69-
assertThat(request.getName().toString()).isEqualTo("docker.io/library/my-app:0.0.1-SNAPSHOT");
70-
assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder");
69+
assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1-SNAPSHOT");
70+
assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-jammy-base");
7171
assertThat(request.getRunImage()).isNull();
7272
assertThat(request.getEnv()).isEmpty();
7373
assertThat(request.isCleanCache()).isFalse();
@@ -83,15 +83,15 @@ void getBuildRequestWhenHasBuilderUsesBuilder() {
8383
Image image = new Image();
8484
image.builder = "springboot/builder:2.2.x";
8585
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
86-
assertThat(request.getBuilder().toString()).isEqualTo("docker.io/springboot/builder:2.2.x");
86+
assertThat(request.getBuilder()).hasToString("docker.io/springboot/builder:2.2.x");
8787
}
8888

8989
@Test
9090
void getBuildRequestWhenHasRunImageUsesRunImage() {
9191
Image image = new Image();
9292
image.runImage = "springboot/run:latest";
9393
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
94-
assertThat(request.getRunImage().toString()).isEqualTo("docker.io/springboot/run:latest");
94+
assertThat(request.getRunImage()).hasToString("docker.io/springboot/run:latest");
9595
}
9696

9797
@Test

0 commit comments

Comments
 (0)