Commit Graph

224 Commits

Author SHA1 Message Date
Stéphane Nicoll f3d86b65a1 Merge branch '3.3.x'
Closes gh-42686
2024-10-15 09:32: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
Moritz Halbritter dd9a998cfe Polish "Add property to specify Docker Compose flags"
See gh-42571
2024-10-10 08:56:02 +02:00
Dmytro Nosan 2bee29c2fd Add property to specify Docker Compose flags
See gh-42571
2024-10-10 08:56:02 +02:00
Moritz Halbritter e6165b0311 Add transport and connect timeout properties for OTLP logging
Closes gh-42528
Closes gh-42527
2024-10-08 16:01:09 +02:00
Moritz Halbritter 40bb81419d Rename OtlpAutoConfiguration to OtlpTracingAutoConfiguration
Closes gh-42529
2024-10-08 15:56:18 +02:00
Moritz Halbritter 33def6d6b4 Polish "Add service connection support for Hazelcast"
See gh-42416
2024-09-26 16:45:26 +02:00
Dmytro Nosan cee7439dbe Add service connection support for Hazelcast
See gh-42416
2024-09-26 14:34:12 +02:00
Phillip Webb 7b3077280c Merge branch '3.3.x'
Closes gh-42441
2024-09-24 14:32:48 -07: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
Moritz Halbritter ee322d69f1 Merge branch '3.3.x'
Closes gh-42394
2024-09-20 10:25:54 +02:00
Yanming Zhou 7c8a6740c1 Remove redundant @Test annotation
See gh-42393
2024-09-20 10:22:47 +02:00
Phillip Webb 8628f7334f Ensure `@AutoConfigureTestDatabase` does not replace test databases
Update `@AutoConfigureTestDatabase` support so that by default test
databases are not replaced.

Fixes gh-35253
2024-09-11 21:01:54 -07:00
Eddú Meléndez 793e9a8795 Add OpenTelemetry Logging Service Connection from LgtmStackContainer and Docker Compose
See gh-42174
2024-09-09 08:37:39 +02:00
Moritz Halbritter 861e5209ef Add transport selection to OtlpLoggingConnectionDetails
Closes gh-42171
2024-09-06 14:26:03 +02:00
Moritz Halbritter bac330354b Polish "Support Otlp Tracing's GRPC port from service connections"
See gh-41333
2024-09-06 13:18:26 +02:00
Eddú Meléndez 7baa553760 Support Otlp Tracing's GRPC port from service connections
Otlp Tracing's exporter is configured using Transport. Current support
for service connections read the mapped port for HTTP transport 4318.
This commits adds support to read port for GRPC transport 4317.

See gh-41333
2024-09-06 13:18:26 +02:00
Moritz Halbritter 8fc1bca56c Polish "Add service connection from Opentelemetry Collector for Logging"
See gh-41324
2024-09-06 10:20:41 +02:00
Eddú Meléndez 7adf843bfd Add service connection from Opentelemetry Collector for Logging
Adds ConnectionDetails from Docker Compose and Testcontainers.

See gh-41324
2024-09-06 10:10:17 +02:00
Scott Frederick e7faca3bbb Add support for Testcontainer Redis
Add support for the official `com.redis:testcontainers-redis` container.

See gh-41450
2024-08-29 19:23:40 -07:00
Phillip Webb 450e31b42e Merge branch '3.3.x' 2024-08-19 16:47:31 -07:00
Moritz Halbritter 6031d04837 Fix property description of spring.docker.compose.file
Also fixes the casing of 'Docker Compose' so that it's now spelled
consistently.
2024-08-12 13:52:53 +02:00
Moritz Halbritter 0261784443 Fix DockerComposeFileTests on Windows 2024-08-06 09:37:53 +02:00
Moritz Halbritter 4eebb8e629 Support multiple Docker Compose files
Closes gh-41691
2024-08-05 12:26:37 +02:00
Stéphane Nicoll 788417df7f Remove duplicate metadata for Enum default values
See gh-7562
2024-08-01 15:43:22 +02:00
Stéphane Nicoll dabc83338b Polish "Add support for Grafana LGTM stack"
See gh-41551
2024-07-29 10:43:56 +02:00
Eddú Meléndez 9eff627eb2 Add support for Grafana LGTM stack
See gh-41551
2024-07-29 10:33:08 +02:00
Phillip Webb 88480664d7 Polish 2024-07-22 19:59:27 +01:00
Andy Wilkinson 46ec3e3a07 Polish "Support service connections for redis-stack and redis-stack-server"
See gh-41327
2024-07-17 11:08:52 +01:00
Eddú Meléndez 2634d0c6b1 Support service connections for redis-stack and redis-stack-server
See gh-41327
2024-07-17 10:54:06 +01:00
Andy Wilkinson 3b13490689 Polish "Add support for Postgres trust host auth method with Docker Compose"
See gh-41511
2024-07-16 19:16:59 +01:00
sid af89924582 Add support for Postgres trust host auth method with Docker Compose
See gh-41511
2024-07-16 19:16:23 +01:00
Andy Wilkinson 2ce36f9141 Merge branch '3.3.x'
Closes gh-41261
2024-06-27 14:35:23 +01: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 7e01e78b7f Merge branch '3.3.x' 2024-06-27 13:58:14 +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 b28ed2f8fb Merge branch '3.3.x' 2024-06-27 10:59:18 +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 5b7365b63b Merge branch '3.3.x'
Closes gh-41258
2024-06-27 10:25:32 +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 6c0c9b9a80 Add properties to specify arguments to Docker Compose commands
These new properties take a List<String>:

- spring.docker.compose.start.arguments
- spring.docker.compose.stop.arguments

Closes gh-38763
2024-06-21 08:54:14 +02: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
Eddú Meléndez f3e7325064 Add service connection for Docker Compose and Testcontainers ActiveMQ
See gh-39363
2024-02-02 09:05:37 +01:00
Moritz Halbritter 1f321c4421 Polish "Add service connection for Docker Compose and Testcontainers Artemis"
See gh-39311
2024-01-31 08:37:03 +01:00
Eddú Meléndez f15cd93a35 Add service connection for Docker Compose and Testcontainers Artemis
See gh-39311
2024-01-31 08:37:03 +01:00
Moritz Halbritter cd9b51d02c Merge branch '3.2.x'
Closes gh-39335
2024-01-30 13:35:20 +01:00
Eddú Meléndez 1247f89209 Polish
See gh-39312
2024-01-30 13:34:40 +01:00
Scott Frederick bee6fe899c Polish "Add Docker Compose service connection support for OpenLDAP"
See gh-39258
2024-01-22 16:51:45 -06:00
PhilKes eb940c3907 Add Docker Compose service connection support for OpenLDAP
See gh-39258
2024-01-22 16:51:45 -06: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