root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Use single-arch image to test platform mismatch detection 

See gh-44059
This commit is contained in:
Moritz Halbritter 2025-03-10 11:00:55 +01:00
parent 92a063faca
commit 24854f469c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java
View File

@ -518,7 +518,7 @@ class BootBuildImageIntegrationTests {
writeMainClass(); writeMainClass();
BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage"); BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage");
assertThat(result.getOutput()).contains( assertThat(result.getOutput()).contains(
"Image platform mismatch detected. The configured platform 'invalid/platform' is not supported by the image 'ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1'. Requested platform 'invalid/platform' but got 'linux/amd64'"); "Image platform mismatch detected. The configured platform 'invalid/platform' is not supported by the image 'ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.3-amd64'. Requested platform 'invalid/platform' but got 'linux/amd64'");
} }
private void writeMainClass() throws IOException { private void writeMainClass() throws IOException {

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithIncompatiblePlatform.gradle
View File

@ -4,8 +4,6 @@ plugins {
} }
bootBuildImage { bootBuildImage {
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1" builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.3-amd64"
runImage = "paketobuildpacks/run-jammy-tiny"
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"]
imagePlatform = "invalid/platform" imagePlatform = "invalid/platform"
} }