Merge branch '4.0.x'

.github/workflows/run-system-tests.yml

@@ -18,6 +18,10 @@ jobs:
           - version: 21
             toolchain: true
     steps:
+      - name: Setup Docker and Disable containerd-snapshotter)
+        uses: docker/setup-docker-action@e43656e248c0bd0647d3f5c195d116aacf6fcaf4 # v4.7.0
+        with:
+          daemon-config: '{"features":{"containerd-snapshotter":false}}'		
       - name: Check Out Code
         uses: actions/checkout@v6
       - name: Prepare Gradle Build

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

@@ -56,6 +56,5 @@ application {
 bootBuildImage {
 	archiveFile = distZip.archiveFile
 	runImage = "paketobuildpacks/ubuntu-noble-run:latest"
-	imagePlatform = "linux/amd64"
 	environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()]
 }

system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle

@@ -48,7 +48,6 @@ war {
 bootBuildImage {
 	archiveFile = war.archiveFile
 	runImage = "paketobuildpacks/ubuntu-noble-run:latest"
-	imagePlatform = "linux/amd64"
 	environment = [
 		'BP_JVM_VERSION': java.targetCompatibility.getMajorVersion(),
 		'BP_TOMCAT_VERSION': '11.*',