Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Paketo tiny builder by default for JVM and native apps

Browse Source 
Closes gh-40859
This commit is contained in:
Scott Frederick
2024-06-28 11:30:43 -05:00
parent 99904d0307
commit 26b59ae912
13 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java
View File

@@ -274,13 +274,9 @@ class PaketoBuilderTests {
"paketo-buildpacks/apache-tomcat", "paketo-buildpacks/dist-zip",
"paketo-buildpacks/spring-boot");
metadata.processOfType("web")
.satisfiesExactly((command) -> assertThat(command).endsWith("sh"),
(arg) -> assertThat(arg).endsWith("catalina.sh"),
(arg) -> assertThat(arg).isEqualTo("run"));
.containsSubsequence("java", "org.apache.catalina.startup.Bootstrap", "start");
metadata.processOfType("tomcat")
.satisfiesExactly((command) -> assertThat(command).endsWith("sh"),
(arg) -> assertThat(arg).endsWith("catalina.sh"),
(arg) -> assertThat(arg).isEqualTo("run"));
.containsSubsequence("java", "org.apache.catalina.startup.Bootstrap", "start");
});
assertImageHasJvmSbomLayer(imageReference, config);
assertImageHasDependenciesSbomLayer(imageReference, config, "apache-tomcat");

1
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle
View File

@@ -38,5 +38,6 @@ application {
bootBuildImage {
archiveFile = bootDistZip.archiveFile
builder = "paketobuildpacks/builder-jammy-base:latest"
environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()]
}

1
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle
View File

@@ -38,5 +38,6 @@ application {
bootBuildImage {
archiveFile = distZip.archiveFile
builder = "paketobuildpacks/builder-jammy-base:latest"
environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()]
}