Commit Graph

109 Commits

Author SHA1 Message Date
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
c2f21e9fcd Don't execute @DockerComposeTests if docker is not running
Closes gh-41171
2024-06-20 08:47:56 +02: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
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
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
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
Moritz Halbritter
957facf1cc Merge branch '3.1.x' into 3.2.x
Closes gh-40117
2024-03-27 09:35:44 +01: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
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
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
Eddú Meléndez
1247f89209 Polish
See gh-39312
2024-01-30 13:34:40 +01:00
Moritz Halbritter
de70b4fb4c Merge branch '3.1.x'
Closes gh-38661
2023-12-05 14:02:52 +01:00
Moritz Halbritter
3f29c7f84f Add log message if Docker Compose services are already running
Closes gh-38398
2023-12-05 14:02:16 +01:00
Andy Wilkinson
a7571cf667 Use different default database names for Oracle XE and Oracle Free
Closes gh-38476
2023-11-22 10:48:35 +00:00
Phillip Webb
6c3dec42e0 Add container support for Oracle Free which replaces Oracle XE
Update Docker Compose and Testcontainers support to work with
`gvenzl/oracle-free` which replaces `gvenzl/oracle-xe`.

Closes gh-38476
2023-11-21 11:51:59 -08:00
Moritz Halbritter
9fc3ef7c93 Merge branch '3.1.x'
Closes gh-38220
2023-11-06 08:45:06 +01:00
Moritz Halbritter
7829e760da Switch JsonMapper in Docker JSON parsing to english locale
Closes gh-37648
2023-11-06 08:41:10 +01:00
Moritz Halbritter
bdc5c05a83 Merge branch '3.1.x'
Closes gh-38145
2023-10-31 11:21:56 +01:00
Moritz Halbritter
de1ca5e60f Polish DockerComposeLifecycleManager 2023-10-31 11:18:39 +01:00
Moritz Halbritter
b11d06deb1 Merge branch '3.1.x'
Closes gh-37991
2023-10-23 10:42:42 +02:00
Moritz Halbritter
09821feb75 Fix container inspection for Docker Compose >= 2.23.0
Docker Compose starting with 2.23.0 returns truncated ids in the
docker compose ps call. We now do a prefix search if an exact match
isn't found in the docker inspect response.

Closes gh-37982
2023-10-23 10:40:20 +02:00
Johnny Lim
446677375e Polish gh-35082
See gh-37831
2023-10-12 14:17:02 +02:00
Andy Wilkinson
7d40a45b50 Merge branch '3.1.x'
Closes gh-37662
2023-10-03 11:21:29 +01:00
Andy Wilkinson
a4100e12ff Merge branch '3.0.x' into 3.1.x
Closes gh-37661
2023-10-03 11:05:51 +01:00
Scott Frederick
619a0f3b35 Merge branch '3.1.x'
Closes gh-37624
2023-09-28 16:32:45 -05:00
JinseongHwang
0b703f9007 Use consistent capitalization in MySQL and MariaDB test names
See gh-37497
2023-09-28 16:28:32 -05:00
Andy Wilkinson
e3d884803e Add Docker Compose support for Neo4j
Closes gh-37379
2023-09-14 13:25:38 +01:00
Moritz Halbritter
f94693a251 Merge branch '3.1.x' 2023-09-14 11:29:18 +02:00
Moritz Halbritter
fdd9bc732f Enable RabbitEnvironmentTests 2023-09-14 11:25:20 +02:00
Moritz Halbritter
136a5b4c07 Enable PostgresEnvironmentTests 2023-09-14 11:25:06 +02:00
Moritz Halbritter
496b373fce Remove unused test 2023-09-14 11:22:54 +02:00
Moritz Halbritter
0f019b0049 Reign in Cassandra memory consumption when running tests
The environment variables are the same as the Cassandra Testcontainers
uses.
2023-09-14 11:20:22 +02:00
Moritz Halbritter
3dd6372602 Polish "Add service connection from OpenTelemetry Collector"
See gh-35082
2023-09-14 11:10:19 +02:00
Moritz Halbritter
c387c87fda Polish "Add service connection from OpenTelemetry Collector"
See gh-35082
2023-09-14 10:50:36 +02:00
Eddú Meléndez
6997277f75 Add service connection from OpenTelemetry Collector
See gh-35082
2023-09-14 09:44:20 +02:00
Phillip Webb
750c597225 Polish 'Add Pulsar ConnectionDetails support'
See gh-37197
2023-09-06 12:18:09 -07:00
Chris Bono
089fef0392 Add Pulsar ConnectionDetails support
Add `ConnectionDetails` support for Apache Pulsar and provide adapters
for Docker Compose and Testcontainers.

See gh-37197
2023-09-06 12:12:25 -07:00
Stephane Nicoll
ad820cc99d Merge branch '3.1.x' 2023-08-22 12:52:25 +02:00
Stephane Nicoll
44847d6600 Fix assertion (sorry)
See gh-37044
2023-08-22 12:51:33 +02:00
Stephane Nicoll
15f14a6082 Merge branch '3.1.x' 2023-08-22 11:59:50 +02:00
Stephane Nicoll
621db533dc Fix assertion
See gh-37044
2023-08-22 11:58:38 +02:00
Stephane Nicoll
65ec6897e9 Merge branch '3.1.x'
Closes gh-37064
2023-08-22 10:49:37 +02:00
Stephane Nicoll
5a25c31832 Polish "Fix password property for Oracle container"
See gh-37044
2023-08-22 10:48:39 +02:00
Joe Steel
ab1e521388 Fix password property for Oracle container
See gh-37044
2023-08-22 10:40:52 +02:00
Phillip Webb
d73d8f8e4f Merge branch '3.1.x' 2023-08-13 19:15:56 -07:00