Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x'

Browse Source 
Closes gh-35589
This commit is contained in:
Stephane Nicoll
2023-05-22 16:24:56 +02:00
parent aa4dd4aae2 ca8ebbf4ab
commit 7a9bb55fdf
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/docker-compose.adoc
View File

@@ -48,7 +48,7 @@ When doing so, the connection details take precedence over any connection-relate
When using Spring Boot’s Docker Compose support, service connections are established to the port mapped by the container.
NOTE: Docker compose is usually used in such a way that the ports inside the container are mapped to ephemeral ports on your computer.
For example, A Postgres server my run inside the container using port 5432 but be mapped to a totally different port locally.
For example, A Postgres server may run inside the container using port 5432 but be mapped to a totally different port locally.
The service connection will always discover and use the locally mapped port.
Service connections are established by using the image name of the container.
@@ -154,7 +154,7 @@ The recommended way of checking for readiness is to add a `healthcheck` section
Since it's not uncommon for `healthcheck` configuration to be omitted from `compose.yml` files, Spring Boot also checks directly for service readiness.
By default, a container is considered ready when a TCP/IP connection can be established to its mapped port.
You can disable this on a per-container basis by add a `org.springframework.boot.readiness-check.tcp.disable` label in your `compose.yml` file.
You can disable this on a per-container basis by adding a `org.springframework.boot.readiness-check.tcp.disable` label in your `compose.yml` file.
For example: