Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-05-31 09:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add testcontainers-local.properties handling.

Browse Source 
Original Pull Request #3062
Closes #3061

Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>
(cherry picked from commit 64f88ae9aca33d335ac2840f6bbbefe014cf4b7c)
(cherry picked from commit 8558c44714a36b4dc8f0fd7f65ccd733265bba49)
This commit is contained in:
Peter-Josef Meisch 2025-02-19 20:14:16 +01:00
parent d7abbc719f
commit 0c4a641163
No known key found for this signature in database
GPG Key ID: DE108246970C7708
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -33,3 +33,4 @@ node
package-lock.json
.mvn/.develocity
/src/test/resources/testcontainers-local.properties

3
src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java
View File

@ -129,6 +129,9 @@ public class ClusterConnection implements ExtensionContext.Store.CloseableResour
Map<String, String> testcontainersProperties = testcontainersProperties(
"testcontainers-" + testcontainersConfiguration + ".properties");
var testcontainersPropertiesLocal = testcontainersProperties("testcontainers-local.properties");
testcontainersProperties.putAll(testcontainersPropertiesLocal);
DockerImageName dockerImageName = getDockerImageName(testcontainersProperties);
ElasticsearchContainer elasticsearchContainer = new SpringDataElasticsearchContainer(dockerImageName)