150 Commits

Author SHA1 Message Date
Johnny Lim
6c8d41935f Polish
See gh-43879

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-01-24 08:45:41 +00:00
Andy Wilkinson
d4f497d90d Polish "Fix handling of env vars in Bitnami's Postgres image"
See gh-43783
2025-01-14 19:53:30 +00:00
He Zean
c8f2fb0d94 Fix handling of env vars in Bitnami's Postgres image
See gh-43783

Signed-off-by: He Zean <realhezean@gmail.com>
2025-01-14 17:49:59 +00:00
Phillip Webb
c2d8218f6d Update copyright year of changed files 2025-01-08 15:45:34 -08:00
Phillip Webb
962514601f Restore support for docker compose versions earlier than 2.24
Fixes gh-43710
2025-01-07 19:13:58 -08:00
Moritz Halbritter
e2cf9e105c Respect profiles when listing running Docker Compose containers
Closes gh-40139
2024-12-10 14:24:44 +01:00
Phillip Webb
223886ff37 Merge branch '3.2.x' into 3.3.x 2024-10-18 10:48:51 -07:00
Phillip Webb
3481107ff7 Update copyright year of changed files 2024-10-18 10:48:29 -07:00
Moritz Halbritter
8efe6e02d9 Merge branch '3.2.x' into 3.3.x
Closes gh-42735
2024-10-17 13:38:03 +02:00
Moritz Halbritter
a3060652f8 Call String.toLowerCase and .toUppercase with explicit locale
Closes gh-42719
2024-10-17 13:20:39 +02:00
Stéphane Nicoll
e291e120f7 Merge branch '3.2.x' into 3.3.x
Closes gh-42685
2024-10-15 09:32:33 +02:00
Stéphane Nicoll
d98ed306d2 Polish "Fix links to CNCF resources in Javadoc"
See gh-42645
2024-10-15 09:28:02 +02:00
Dmytro Nosan
43a1145e75 Fix links to CNCF resources in Javadoc
See gh-42645
2024-10-15 09:26:27 +02:00
Phillip Webb
100bedc07d Merge branch '3.2.x' into 3.3.x
Closes gh-42440
2024-09-24 14:29:09 -07:00
Phillip Webb
ad72411e2b Apply conventions plugin to all subprojects
Closes gh-42438
2024-09-24 14:26:32 -07:00
Yanming Zhou
7c8a6740c1 Remove redundant @Test annotation
See gh-42393
2024-09-20 10:22:47 +02:00
Andy Wilkinson
abb3ff0377 Combine tests for standard and Bitnami images into single classes
Closes gh-41259
2024-06-27 14:34:55 +01:00
Andy Wilkinson
7b65176180 Move Redis Bitname compose file into correct directory
See gh-41257
2024-06-27 13:57:40 +01:00
Andy Wilkinson
adad8a3515 More LDAP compose file into correct source set
See gh-41257
2024-06-27 10:59:03 +01:00
Andy Wilkinson
b0d4f1d356 Merge branch '3.2.x' into 3.3.x
Closes gh-41257
2024-06-27 10:16:36 +01:00
Andy Wilkinson
654016af7f Move Docker-related test support into a separate module
See gh-41228
2024-06-26 19:47:35 +01:00
Andy Wilkinson
6fbf08fa9a Update spring-boot-docker-compose to use docker-test plugin
See gh-41228
2024-06-26 19:46:03 +01:00
Moritz Halbritter
8e405c0224 Merge branch '3.2.x'
Closes gh-41172
2024-06-20 08:48:11 +02:00
Moritz Halbritter
c2f21e9fcd Don't execute @DockerComposeTests if docker is not running
Closes gh-41171
2024-06-20 08:47:56 +02:00
Phillip Webb
9ab086d2b4 Merge branch '3.2.x'
Closes gh-41169
2024-06-19 22:53:38 -07:00
Andy Wilkinson
126e87e44d Fix appending of JDBC parameters to SQL Server JDBC URL
Fixes gh-41146
2024-06-19 22:51:40 -07:00
Phillip Webb
f2c778a5a0 Merge branch '3.2.x'
Closes gh-41168
2024-06-19 22:44:12 -07:00
Andy Wilkinson
43cd24102f Rework Docker Compose integration tests
This commit introduces a new annotation, `@DockerComposeTest`,
that allows a test class to have multiple tests, each of which
uses a different Docker Compose YAML file.

Closes gh-41154
2024-06-19 22:34:38 -07:00
Phillip Webb
905d6b96d0 Merge branch '3.2.x'
Closes gh-41166
2024-06-19 22:30:58 -07:00
Andy Wilkinson
491f34d25c Improve container test code
Replace `DockerImageNames` with a enum and relocate it from the
`testcontainers` to `container` package. The enum now also
becomes a common location that we can use to apply container
configuration such as timeouts.

Closes gh-41164

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-06-19 20:10:03 -07:00
Scott Frederick
7d96789869 Fix Bitnami MongoDB environment variables for Docker Compose
Fixes gh-41097
2024-06-13 15:20:36 -05:00
Phillip Webb
147240aa0c Merge branch '3.2.x'
Closes gh-41080
2024-06-11 13:32:30 -07:00
Phillip Webb
bcbcafaab2 Polish "Use method references when possible in test code"
See gh-40974
2024-06-11 12:58:04 -07:00
Ahmed Ashour
207327d97c Use method references when possible in test code
See gh-40974
2024-06-11 12:58:00 -07:00
Johnny Lim
3c76f81fe3 Polish
See gh-40449
2024-04-22 12:27:49 +01:00
Moritz Halbritter
6d192e62fd Add property to control Docker Compose start command execution
If the property 'spring.docker.compose.start.skip' is set to 'never',
the start command is always executed. The default value of 'if-running'
only executes the start command if there are no services running
already, which is the old behavior.

Closes gh-39749
2024-04-05 08:36:28 +02:00
Moritz Halbritter
3ab21ce146 Merge branch '3.2.x'
Closes gh-40118
2024-03-27 09:42:59 +01:00
Moritz Halbritter
957facf1cc Merge branch '3.1.x' into 3.2.x
Closes gh-40117
2024-03-27 09:35:44 +01:00
Moritz Halbritter
e6a0202f55 Disable test on AARCH64 2024-02-28 17:59:47 +01:00
Phillip Webb
f8a1dae835 Merge branch '3.2.x' 2024-02-21 15:27:57 -08:00
Phillip Webb
12de6aa46a Merge branch '3.1.x' into 3.2.x 2024-02-21 15:27:27 -08:00
Phillip Webb
2c4909a89a Update copyright year of changed files 2024-02-21 13:58:53 -08:00
Scott Frederick
bb384f268e Merge branch '3.2.x'
Closes gh-39639
2024-02-20 10:34:54 -06:00
Scott Frederick
71e5e1252a Merge branch '3.1.x' into 3.2.x
Closes gh-39638
2024-02-20 10:34:32 -06:00
Scott Frederick
c93acdafbd Polish "Prevent long parse times for images with illegal char in tag"
See gh-39617
2024-02-20 10:27:28 -06:00
Jakob Wanger
c892544741 Prevent long parse times for images with illegal char in tag
Update the regular expression used to parse Docker images references to
prevent catastrophic backtracking when images names are long and the
tag contains an illegal character.

See gh-39617
2024-02-20 10:27:27 -06:00
Moritz Halbritter
7f55cae90f Merge branch '3.2.x' 2024-02-12 10:19:46 +01:00
Moritz Halbritter
4387b79831 Merge branch '3.1.x' into 3.2.x 2024-02-12 10:18:46 +01:00
Moritz Halbritter
8ffcfc9b77 Harmonize style of igored exceptions across the codebase 2024-02-12 10:14:20 +01:00
Scott Frederick
09a6ae51cc Add support for Bitnami container images with Docker Compose
Closes gh-35759
2024-02-09 14:58:25 -06:00