Skip to content

Commit 24854f4

Browse files
committed
Use single-arch image to test platform mismatch detection
See gh-44059
1 parent 92a063f commit 24854f4

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ void failsWithIncompatiblePlatform() throws IOException {
518518
writeMainClass();
519519
BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage");
520520
assertThat(result.getOutput()).contains(
521-
"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'");
521+
"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'");
522522
}
523523

524524
private void writeMainClass() throws IOException {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ plugins {
44
}
55

66
bootBuildImage {
7-
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.1"
8-
runImage = "paketobuildpacks/run-jammy-tiny"
9-
buildpacks = ["ghcr.io/spring-io/spring-boot-test-info:0.0.1"]
7+
builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.3-amd64"
108
imagePlatform = "invalid/platform"
119
}

0 commit comments

Comments
 (0)