Merge branch '2.5.x' into 2.6.x

Closes gh-30749

Author: snicoll

spring-boot-project/spring-boot-docs/src/docs/asciidoc/container-images/dockerfiles.adoc

@@ -32,13 +32,13 @@ Here is an example of a Dockerfile using `jarmode`.
 
 [source,dockerfile,indent=0,subs="verbatim"]
 ----
-FROM adoptopenjdk:11-jre-hotspot as builder
+FROM eclipse-temurin:11-jre as builder
 WORKDIR application
 ARG JAR_FILE=target/*.jar
 COPY ${JAR_FILE} application.jar
 RUN java -Djarmode=layertools -jar application.jar extract
 
-FROM adoptopenjdk:11-jre-hotspot
+FROM eclipse-temurin:11-jre
 WORKDIR application
 COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./