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

138 Commits

Author SHA1 Message Date
Andy Wilkinson
579be1cea8 Merge branch '3.4.x' 
Closes gh-43824
 2025-01-14 20:14:23 +00:00
Andy Wilkinson
1a99ade66c Merge branch '3.3.x' into 3.4.x 
Closes gh-43823
 2025-01-14 20:13:57 +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
a49719d73e Use consistent exception messages in Assert calls 
Update `Assert` calls to consistently use messages of the form
"'item' must [not] ...".

Closes gh-43780
 2025-01-11 21:18:47 -08:00
Phillip Webb
f08188d5cf Change relevant Assert calls to throw IllegalStateException 
Change certain Assert class from `assert...` to `assertState`
so that a more appropriate `IllegalStateException` is thrown.

Fixes gh-43779
 2025-01-11 21:16:36 -08:00
Phillip Webb
b48ce96746 Update copyright year of changed files 2025-01-08 15:46:10 -08:00
Phillip Webb
af2d176588 Merge branch '3.4.x' 2025-01-08 15:45:59 -08:00
Phillip Webb
d44f4b56d3 Merge branch '3.3.x' into 3.4.x 2025-01-08 15:45:54 -08:00
Phillip Webb
c2d8218f6d Update copyright year of changed files 2025-01-08 15:45:34 -08:00
Phillip Webb
879d664bd5 Merge branch '3.4.x' 
Closes gh-43718
 2025-01-07 19:23:01 -08:00
Phillip Webb
d998720f75 Merge branch '3.3.x' into 3.4.x 
Closes gh-43717
 2025-01-07 19:22:22 -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
Dmytro Nosan
ce0bcf3493 Configure Postgres' application_name from the environment 
This commit configure the 'application_name' property of the Postgres
container from the standard 'spring.application.name'.

See gh-42460
 2025-01-07 16:32:31 +01:00
Moritz Halbritter
ce9878a7d0 Merge branch '3.3.x' 
Closes gh-43472
 2024-12-10 15:43:46 +01:00
Moritz Halbritter
e2cf9e105c Respect profiles when listing running Docker Compose containers 
Closes gh-40139
 2024-12-10 14:24:44 +01:00
Stéphane Nicoll
27e8f14c31 Polish "Add container support for ClickHouse" 
See gh-42837
 2024-10-23 18:15:43 +02:00
Stéphane Nicoll
b7979cf443 Use AbstractAotProcessor.AOT_PROCESSING instead of duplicate constant 
Closes gh-42461
 2024-10-18 10:12:01 +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
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
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
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
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
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
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
Scott Frederick
bb384f268e Merge branch '3.2.x' 
Closes gh-39639
 2024-02-20 10:34:54 -06:00