spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Add support for docker.elastic.co/elasticsearch/elasticsearch

Browse Source 
See gh-50119

Signed-off-by: itsmevichu <vishnutheep@gmail.com>
This commit is contained in:
itsmevichu
2026-04-20 08:51:50 +02:00
committed by Moritz Halbritter
parent 1e58a6e711
commit 1b712e0434
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java
+11 -10
View File
@@ -39,16 +39,17 @@ class ConnectionNamePredicateTests {
@Test
void official() {
assertThat(predicateOf("elasticsearch")).accepts(sourceOf("elasticsearch"));
assertThat(predicateOf("elasticsearch")).accepts(sourceOf("library/elasticsearch"));
assertThat(predicateOf("elasticsearch")).accepts(sourceOf("docker.io/library/elasticsearch"));
assertThat(predicateOf("elasticsearch")).accepts(sourceOf("docker.io/elasticsearch"));
assertThat(predicateOf("elasticsearch")).accepts(sourceOf("docker.io/elasticsearch:latest"));
assertThat(predicateOf("elasticsearch")).rejects(sourceOf("redis"));
assertThat(predicateOf("elasticsearch")).rejects(sourceOf("library/redis"));
assertThat(predicateOf("elasticsearch")).rejects(sourceOf("docker.io/library/redis"));
assertThat(predicateOf("elasticsearch")).rejects(sourceOf("docker.io/redis"));
assertThat(predicateOf("elasticsearch")).rejects(sourceOf("docker.io/redis"));
assertThat(predicateOf("elasticsearch", "elasticsearch/elasticsearch")).accepts(sourceOf("elasticsearch"))
.accepts(sourceOf("library/elasticsearch"))
.accepts(sourceOf("docker.io/library/elasticsearch"))
.accepts(sourceOf("docker.io/library/elasticsearch"))
.accepts(sourceOf("docker.io/elasticsearch:latest"))
.accepts(sourceOf("docker.elastic.co/elasticsearch/elasticsearch:latest"))
.accepts(sourceOf("docker.elastic.co/elasticsearch/elasticsearch"))
.rejects(sourceOf("redis"))
.rejects(sourceOf("library/redis"))
.rejects(sourceOf("docker.io/library/redis"))
.rejects(sourceOf("docker.io/redis"));
assertThat(predicateOf("zipkin")).rejects(sourceOf("openzipkin/zipkin"));
}
module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/docker/compose/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java
+2 -1
View File
@@ -41,7 +41,8 @@ class ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests {
assertThat(connectionDetails.getSslBundle()).isNull();
}
@DockerComposeTest(composeFile = "elasticsearch-ssl-compose.yaml", image = TestImage.ELASTICSEARCH_9,
@DockerComposeTest(composeFile = "elasticsearch-ssl-compose.yaml",
image = TestImage.ELASTICSEARCH_ELASTIC_REGISTRY_9,
additionalResources = { "ca.crt", "server.crt", "server.key", "client.crt", "client.key" })
void runWithSslCreatesConnectionDetails(ElasticsearchConnectionDetails connectionDetails) {
assertConnectionDetails(connectionDetails, Protocol.HTTPS);
module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/docker/compose/ElasticsearchDockerComposeConnectionDetailsFactory.java
+1 -1
View File
@@ -42,7 +42,7 @@ class ElasticsearchDockerComposeConnectionDetailsFactory
private static final int ELASTICSEARCH_PORT = 9200;
protected ElasticsearchDockerComposeConnectionDetailsFactory() {
super("elasticsearch");
super(new String[] { "elasticsearch", "elasticsearch/elasticsearch" });
}
@Override
test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java
+5
View File
@@ -126,6 +126,11 @@ public enum TestImage {
*/
ELASTICSEARCH_9("elasticsearch", "9.0.2"),
/**
* A container image from Elastic Registry suitable for testing Elasticsearch 9.
*/
ELASTICSEARCH_ELASTIC_REGISTRY_9("docker.elastic.co/elasticsearch/elasticsearch", "9.0.2"),
/**
* A container image suitable for testing Grafana OTel LGTM.
*/