From 64f88ae9aca33d335ac2840f6bbbefe014cf4b7c Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Wed, 19 Feb 2025 20:14:16 +0100 Subject: [PATCH] Add testcontainers-local.properties handling. Original Pull Request #3062 Closes #3061 Signed-off-by: Peter-Josef Meisch --- .gitignore | 1 + .../data/elasticsearch/junit/jupiter/ClusterConnection.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 0b181452a..449f58ea4 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ node package-lock.json .mvn/.develocity +/src/test/resources/testcontainers-local.properties diff --git a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java index 2b2a6bf1e..8ac75d000 100644 --- a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java +++ b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/ClusterConnection.java @@ -129,6 +129,9 @@ public class ClusterConnection implements ExtensionContext.Store.CloseableResour Map testcontainersProperties = testcontainersProperties( "testcontainers-" + testcontainersConfiguration + ".properties"); + var testcontainersPropertiesLocal = testcontainersProperties("testcontainers-local.properties"); + testcontainersProperties.putAll(testcontainersPropertiesLocal); + DockerImageName dockerImageName = getDockerImageName(testcontainersProperties); ElasticsearchContainer elasticsearchContainer = new SpringDataElasticsearchContainer(dockerImageName)