Merge branch '2.7.x' into 3.0.x

Author: mhalbritter

Diff for: spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java

@@ -60,6 +60,8 @@
  */
 @GradleCompatibility(configurationCache = true)
 @DisabledIfDockerUnavailable
+@org.springframework.boot.testsupport.junit.DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
+		disabledReason = "The builder image has no ARM support")
 class BootBuildImageIntegrationTests {
 
 	GradleBuild gradleBuild;

Diff for: spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java

@@ -25,6 +25,7 @@
 import java.util.stream.IntStream;
 
 import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.buildpack.platform.docker.DockerApi;
@@ -45,6 +46,8 @@
  */
 @ExtendWith(MavenBuildExtension.class)
 @DisabledIfDockerUnavailable
+@org.springframework.boot.testsupport.junit.DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
+		disabledReason = "The builder image has no ARM support")
 class BuildImageTests extends AbstractArchiveIntegrationTests {
 
 	@TestTemplate