From 0e43e81e73177a2505ead921e79bb6668eb097d8 Mon Sep 17 00:00:00 2001 From: Matteo Bianchi <47943069+OnSuorce@users.noreply.github.com> Date: Fri, 28 Jul 2023 15:00:32 +0200 Subject: [PATCH 1/2] Add note about enabling docker compose support in tests See gh-36636 --- .../src/docs/asciidoc/features/docker-compose.adoc | 1 + 1 file changed, 1 insertion(+) diff --git 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 index 329bfe408e..e1c7adf81d 100644 --- 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,7 @@ 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: If you wish to run docker compose via `spring-boot-docker-compose` when using `@SpringBootTest` 's tests, the property `configprop:spring.docker.compose.skip.in-tests[]` must be set to `false` [[features.docker-compose.service-connections]] From 5f72e441d0259f42ac94501117570da369a14217 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 31 Jul 2023 09:43:30 +0100 Subject: [PATCH 2/2] Polish "Add note about enabling docker compose support in tests" See gh-36636 --- .../src/docs/asciidoc/features/docker-compose.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git 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 index e1c7adf81d..d91dec9002 100644 --- 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,7 +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: If you wish to run docker compose via `spring-boot-docker-compose` when using `@SpringBootTest` 's tests, the property `configprop:spring.docker.compose.skip.in-tests[]` must be set to `false` +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]]