Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade default CNB builders to Paketo Jammy

Browse Source 
Closes gh-38477
This commit is contained in:
Scott Frederick 2023-08-02 19:06:16 -05:00
parent 95fbb49a08
commit d1cce0f8ef
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/pipeline.yml
View File

@ -191,8 +191,8 @@ resources:
type: registry-image type: registry-image
icon: docker icon: docker
source: source:
repository: paketobuildpacks/builder repository: paketobuildpacks/builder-jammy-base
tag: base tag: latest
- name: artifactory-repo - name: artifactory-repo
type: artifactory-resource type: artifactory-resource
icon: package-variant icon: package-variant

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

@ -43,7 +43,7 @@ import org.springframework.util.Assert;
*/ */
public class BuildRequest { public class BuildRequest {
static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder:base"; static final String DEFAULT_BUILDER_IMAGE_NAME = "paketobuildpacks/builder-jammy-base:latest";
private static final ImageReference DEFAULT_BUILDER = ImageReference.of(DEFAULT_BUILDER_IMAGE_NAME); private static final ImageReference DEFAULT_BUILDER = ImageReference.of(DEFAULT_BUILDER_IMAGE_NAME);

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

@ -105,7 +105,7 @@ The following table summarizes the available properties and their default values
| `builder` | `builder`
| `--builder` | `--builder`
| Name of the Builder image to use. | Name of the Builder image to use.
| `paketobuildpacks/builder:base` | `paketobuildpacks/builder-jammy-base:latest`
| `runImage` | `runImage`
| `--runImage` | `--runImage`

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

@ -194,7 +194,8 @@ class BootBuildImageTests {
@Test @Test
void whenNoBuilderIsConfiguredThenRequestHasDefaultBuilder() { void whenNoBuilderIsConfiguredThenRequestHasDefaultBuilder() {
assertThat(this.buildImage.createRequest().getBuilder().getName()).isEqualTo("paketobuildpacks/builder"); assertThat(this.buildImage.createRequest().getBuilder().getName())
.isEqualTo("paketobuildpacks/builder-jammy-base");
} }
@Test @Test

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

@ -115,7 +115,7 @@ The following table summarizes the available parameters and their default values
| `builder` + | `builder` +
(`spring-boot.build-image.builder`) (`spring-boot.build-image.builder`)
| Name of the Builder image to use. | Name of the Builder image to use.
| `paketobuildpacks/builder:base` | `paketobuildpacks/builder-jammy-base:latest`
| `runImage` + | `runImage` +
(`spring-boot.build-image.runImage`) (`spring-boot.build-image.runImage`)

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

@ -52,7 +52,7 @@ class ImageTests {
@Test @Test
void getBuildRequestWhenNameIsNullDeducesName() { void getBuildRequestWhenNameIsNullDeducesName() {
BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent()); BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent());
assertThat(request.getName().toString()).isEqualTo("docker.io/library/my-app:0.0.1-SNAPSHOT"); assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1-SNAPSHOT");
} }
@Test @Test
@ -60,14 +60,14 @@ class ImageTests {
Image image = new Image(); Image image = new Image();
image.name = "demo"; image.name = "demo";
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent()); BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
assertThat(request.getName().toString()).isEqualTo("docker.io/library/demo:latest"); assertThat(request.getName()).hasToString("docker.io/library/demo:latest");
} }
@Test @Test
void getBuildRequestWhenNoCustomizationsUsesDefaults() { void getBuildRequestWhenNoCustomizationsUsesDefaults() {
BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent()); BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent());
assertThat(request.getName().toString()).isEqualTo("docker.io/library/my-app:0.0.1-SNAPSHOT"); assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1-SNAPSHOT");
assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder"); assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder-jammy-base");
assertThat(request.getRunImage()).isNull(); assertThat(request.getRunImage()).isNull();
assertThat(request.getEnv()).isEmpty(); assertThat(request.getEnv()).isEmpty();
assertThat(request.isCleanCache()).isFalse(); assertThat(request.isCleanCache()).isFalse();
@ -83,7 +83,7 @@ class ImageTests {
Image image = new Image(); Image image = new Image();
image.builder = "springboot/builder:2.2.x"; image.builder = "springboot/builder:2.2.x";
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent()); BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
assertThat(request.getBuilder().toString()).isEqualTo("docker.io/springboot/builder:2.2.x"); assertThat(request.getBuilder()).hasToString("docker.io/springboot/builder:2.2.x");
} }
@Test @Test
@ -91,7 +91,7 @@ class ImageTests {
Image image = new Image(); Image image = new Image();
image.runImage = "springboot/run:latest"; image.runImage = "springboot/run:latest";
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent()); BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
assertThat(request.getRunImage().toString()).isEqualTo("docker.io/springboot/run:latest"); assertThat(request.getRunImage()).hasToString("docker.io/springboot/run:latest");
} }
@Test @Test