mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.7.x' into 3.0.x
Closes gh-35151
This commit is contained in:
commit
ca26789a82
@ -266,8 +266,14 @@ class PaketoBuilderTests {
|
|||||||
.contains("paketo-buildpacks/ca-certificates", "paketo-buildpacks/bellsoft-liberica",
|
.contains("paketo-buildpacks/ca-certificates", "paketo-buildpacks/bellsoft-liberica",
|
||||||
"paketo-buildpacks/apache-tomcat", "paketo-buildpacks/dist-zip",
|
"paketo-buildpacks/apache-tomcat", "paketo-buildpacks/dist-zip",
|
||||||
"paketo-buildpacks/spring-boot");
|
"paketo-buildpacks/spring-boot");
|
||||||
metadata.processOfType("web").containsExactly("bash", "catalina.sh", "run");
|
metadata.processOfType("web")
|
||||||
metadata.processOfType("tomcat").containsExactly("bash", "catalina.sh", "run");
|
.satisfiesExactly((command) -> assertThat(command).endsWith("sh"),
|
||||||
|
(arg) -> assertThat(arg).endsWith("catalina.sh"),
|
||||||
|
(arg) -> assertThat(arg).isEqualTo("run"));
|
||||||
|
metadata.processOfType("tomcat")
|
||||||
|
.satisfiesExactly((command) -> assertThat(command).endsWith("sh"),
|
||||||
|
(arg) -> assertThat(arg).endsWith("catalina.sh"),
|
||||||
|
(arg) -> assertThat(arg).isEqualTo("run"));
|
||||||
});
|
});
|
||||||
assertImageHasJvmSbomLayer(imageReference, config);
|
assertImageHasJvmSbomLayer(imageReference, config);
|
||||||
assertImageHasDependenciesSbomLayer(imageReference, config, "apache-tomcat");
|
assertImageHasDependenciesSbomLayer(imageReference, config, "apache-tomcat");
|
||||||
|
Loading…
Reference in New Issue
Block a user