From b8c541efedfe62503bf910ee380825b6c44f7393 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Wed, 19 Feb 2025 19:38:29 +0100 Subject: [PATCH] Add testcontainers-local.properties handling. 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 0b181452a7..449f58ea44 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 2b2a6bf1e8..8ac75d0004 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 @@ private ClusterConnectionInfo startElasticsearchContainer() { Map testcontainersProperties = testcontainersProperties( "testcontainers-" + testcontainersConfiguration + ".properties"); + var testcontainersPropertiesLocal = testcontainersProperties("testcontainers-local.properties"); + testcontainersProperties.putAll(testcontainersPropertiesLocal); + DockerImageName dockerImageName = getDockerImageName(testcontainersProperties); ElasticsearchContainer elasticsearchContainer = new SpringDataElasticsearchContainer(dockerImageName)