Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x' into 3.4.x

Browse Source 
Closes gh-44475
This commit is contained in:
Moritz Halbritter
2025-02-28 10:32:20 +01:00
parent 589bf2cafc 8c035ce46a
commit da361efd3f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java
View File

@@ -109,7 +109,7 @@ public enum TestImage {
/** /**
* A container image suitable for testing Elasticsearch 7. * A container image suitable for testing Elasticsearch 7.
*/ */
ELASTICSEARCH("docker.elastic.co/elasticsearch/elasticsearch", "7.17.5", () -> ElasticsearchContainer.class, ELASTICSEARCH("docker.elastic.co/elasticsearch/elasticsearch", "7.17.28", () -> ElasticsearchContainer.class,
(container) -> ((ElasticsearchContainer) container).withEnv("ES_JAVA_OPTS", "-Xms32m -Xmx512m") (container) -> ((ElasticsearchContainer) container).withEnv("ES_JAVA_OPTS", "-Xms32m -Xmx512m")
.withStartupAttempts(5) .withStartupAttempts(5)
.withStartupTimeout(Duration.ofMinutes(10))), .withStartupTimeout(Duration.ofMinutes(10))),