Merge branch '3.1.x'

Closes gh-36647
2023-07-31 10:05:05 +01:00
parent 1dd3add5c5 21d2fb6f22
commit 5c845c7ddc
1 changed files with 3 additions and 0 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/docker-compose.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/docker-compose.adoc
@@ -37,6 +37,9 @@ When this module is included as a dependency Spring Boot will do the following:

 NOTE: The `docker compose` or `docker-compose` CLI application needs to be on your path in order for Spring Boot’s support to work correctly.

+NOTE: By default, Spring Boot's Docker Compose support is disabled when running tests.
+To enable it, set configprop:spring.docker.compose.skip.in-tests[] to `false`.
+


 [[features.docker-compose.service-connections]]