fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,041 Commits 22 Branches 339 Tags
Commit Graph

87 Commits

Author SHA1 Message Date
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
Phillip Webb
155300525e Polish 2023-08-13 19:15:38 -07:00
Phillip Webb
2fdc29b885 Revert "Polish" 
This reverts commit 6a65ca13ea642bc7060cdae848bb3fa4e71576da since
FileCopyUtils will close the reader/writer.
 2023-08-13 19:00:04 -07:00
Moritz Halbritter
08ff1c2003 Merge branch '3.1.x' 2023-08-10 14:55:00 +02:00
Moritz Halbritter
6a65ca13ea Polish 2023-08-10 14:54:45 +02:00
Moritz Halbritter
f54d370fcd Remove unused class 2023-08-10 14:54:45 +02:00
Moritz Halbritter
3bb93b37ca Remove --detach and --wait flags from docker compose start command 
Closes gh-36908
 2023-08-10 14:54:45 +02:00
Moritz Halbritter
784488b090 Merge branch '3.1.x' 
Closes gh-36910
 2023-08-10 12:21:26 +02:00
Moritz Halbritter
d48aa806c2 Remove --no-color flag from docker compose start command 
Closes gh-36908
 2023-08-10 12:12:47 +02:00
Moritz Halbritter
7bb337aeb1 Polish tests 2023-08-08 13:12:47 +02:00
Scott Frederick
2452958f7b Merge branch '3.1.x' 
Closes gh-36486
 2023-07-24 15:10:48 -05:00
Scott Frederick
bf08cc25df Use DockerImageNames in Docker compose integration tests 
Closes gh-36485
 2023-07-24 11:00:20 -05:00
Stephane Nicoll
311fa6272d Polish "Add service connection for Testcontainers ActiveMQ" 
This also adds support for Docker Compose.

See gh-35080
 2023-07-20 13:03:41 +02:00
Johnny Lim
e97c5a7118 Use kebab-case for property default values in metadata 
See gh-36170
 2023-07-04 15:20:42 +01:00
Andy Wilkinson
3ef1738a5e Remove containers after use in Docker Compose integration tests 
Closes gh-36104
 2023-06-28 14:12:39 +01:00
Andy Wilkinson
660dbb9afd Fix Maven-built native images with Docker Compose dependency 
Previously, we tried to prevent spring-boot-docker-compose from
causing problems with AOT and native images by excluding it from
the AOT processing classpath. This allowed AOT processing to
succeed. We cannot apply the same exclusion to the native image
classpath so spring-boot-docker-compose was still included in the
native image. This results in a failure at runtime due to missing
reflection hints.

This commit reverts that changes that excluded
spring-boot-docker-compose from the AOT processing classpath. This
allows AOT processing to generate reflection hints but reintroduces
the failure caused by the connection details bean definitions using
an instance supplier callback. To overcome this problem we disable
DockerComposeLifecycleManager during AOT processing and in a native
image. This ensures that no attempt is made to call docker compose up
and no connection details beans are defined.

Fixes gh-35676
 2023-06-21 11:44:30 +01:00
Scott Frederick
8f31a5772e Set authSource in MongoDB Docker Compose connection details 
When authentication credentials are provided in environment variables
for the official MongoDB Docker image, the authentication source must
also be set to the `admin` database.

Fixes gh-35777
 2023-06-08 16:20:57 -05:00
Moritz Halbritter
157b71b333 Add missing defaults for docker compose properties 
Closes gh-35598
 2023-05-23 10:53:15 +02:00
Scott Frederick
0ca3ab7249 Polish Javadoc 
See gh-35545
 2023-05-19 14:20:14 -05:00
Andy Wilkinson
6ad71c9b0c Reduce number of CLI calls to improve startup time with devtools 
Update `DockerComposeLifecycleManager` so that `docker ps` is
not called multiple times.

See gh-35435
 2023-05-17 16:27:00 -07:00
Phillip Webb
b0c76c1f79 Cache docker commands to improve startup time with devtools 
Update `DockerCli` so that the docker commands are cached. This helps
improve startup time when using devtools with docker compose.

See gh-35435
 2023-05-17 16:27:00 -07:00
Phillip Webb
a8602a1814 Allow docker compose service readiness checks to be bypassed 
Add `spring.docker.compose.readiness.wait` property that can be used to
determine how Spring Boot should wait for docker compose services to
become ready.

Fixes gh-35545
 2023-05-17 16:27:00 -07:00
Phillip Webb
6b0b6ccf49 Move docker compose readiness code and make it package-private 
The `ReadinessCheck` interface has been removed making the dedicated
package less necessary. By relocating the code we can make more of it
pacakge-private.

See gh-35544
 2023-05-17 16:26:59 -07:00