Skip to content

Commit 0c4a641

Browse files
committed
Add testcontainers-local.properties handling.
Original Pull Request #3062 Closes #3061 Signed-off-by: Peter-Josef Meisch <[email protected]> (cherry picked from commit 64f88ae) (cherry picked from commit 8558c44)
1 parent d7abbc7 commit 0c4a641

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ node
3333
package-lock.json
3434

3535
.mvn/.develocity
36+
/src/test/resources/testcontainers-local.properties

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

+3
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ private ClusterConnectionInfo startElasticsearchContainer() {
129129
Map<String, String> testcontainersProperties = testcontainersProperties(
130130
"testcontainers-" + testcontainersConfiguration + ".properties");
131131

132+
var testcontainersPropertiesLocal = testcontainersProperties("testcontainers-local.properties");
133+
testcontainersProperties.putAll(testcontainersPropertiesLocal);
134+
132135
DockerImageName dockerImageName = getDockerImageName(testcontainersProperties);
133136

134137
ElasticsearchContainer elasticsearchContainer = new SpringDataElasticsearchContainer(dockerImageName)

0 commit comments

Comments
 (0)