Skip to content

Commit 1bfb966

Browse files
Deprecate support for docker.elastic.co/elasticsearch/elasticsearch-oss (#4574)
Since version 7.11.0, there is no more `docker.elastic.co/elasticsearch/elasticsearch-oss` artifact anymore. --------- Co-authored-by: Eddú Meléndez Gonzales <[email protected]>
1 parent 89e7f23 commit 1bfb966

File tree

3 files changed

+14
-21
lines changed

3 files changed

+14
-21
lines changed

docs/modules/elasticsearch.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,6 @@ You can turn on security by providing a password:
2828
[HttpClient](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:httpClientSecuredContainer
2929
<!--/codeinclude-->
3030

31-
## Choose your Elasticsearch license
32-
33-
If you prefer to start a Docker image with the pure OSS version (which means with no security in older versions or
34-
other new and advanced features), you can use this instead:
35-
36-
<!--codeinclude-->
37-
[Elasticsearch OSS](../../modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java) inside_block:ossContainer
38-
<!--/codeinclude-->
39-
4031
## Adding this module to your project dependencies
4132

4233
Add the following dependency to your `pom.xml`/`build.gradle` file:

modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.testcontainers.containers.BindMode;
99
import org.testcontainers.containers.GenericContainer;
1010
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
11-
import org.testcontainers.utility.Base58;
1211
import org.testcontainers.utility.ComparableVersion;
1312
import org.testcontainers.utility.DockerImageName;
1413

@@ -60,6 +59,7 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
6059
"docker.elastic.co/elasticsearch/elasticsearch"
6160
);
6261

62+
@Deprecated
6363
private static final DockerImageName DEFAULT_OSS_IMAGE_NAME = DockerImageName.parse(
6464
"docker.elastic.co/elasticsearch/elasticsearch-oss"
6565
);
@@ -72,7 +72,8 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
7272
@Deprecated
7373
protected static final String DEFAULT_TAG = "7.9.2";
7474

75-
private final boolean isOss;
75+
@Deprecated
76+
private boolean isOss = false;
7677

7778
private final boolean isAtLeastMajorVersion8;
7879

@@ -103,9 +104,16 @@ public ElasticsearchContainer(String dockerImageName) {
103104
public ElasticsearchContainer(final DockerImageName dockerImageName) {
104105
super(dockerImageName);
105106
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DEFAULT_OSS_IMAGE_NAME, ELASTICSEARCH_IMAGE_NAME);
106-
this.isOss = dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME);
107107

108-
withNetworkAliases("elasticsearch-" + Base58.randomString(6));
108+
if (dockerImageName.isCompatibleWith(DEFAULT_OSS_IMAGE_NAME)) {
109+
this.isOss = true;
110+
log.warn(
111+
"{} is not supported anymore after 7.10.2. Please switch to {}",
112+
dockerImageName.getUnversionedPart(),
113+
DEFAULT_IMAGE_NAME.getUnversionedPart()
114+
);
115+
}
116+
109117
withEnv("discovery.type", "single-node");
110118
// disable disk threshold checks
111119
withEnv("cluster.routing.allocation.disk.threshold_enabled", "false");

modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,7 @@ public void elasticsearchOssImage() throws IOException {
166166
try (
167167
// ossContainer {
168168
ElasticsearchContainer container = new ElasticsearchContainer(
169-
DockerImageName
170-
.parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
171-
.withTag(ELASTICSEARCH_VERSION)
169+
"docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2"
172170
)
173171
// }
174172
) {
@@ -282,11 +280,7 @@ public void incompatibleSettingsTest() {
282280
// The OSS image can not use security feature
283281
assertThat(
284282
catchThrowable(() -> {
285-
new ElasticsearchContainer(
286-
DockerImageName
287-
.parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
288-
.withTag(ELASTICSEARCH_VERSION)
289-
)
283+
new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2")
290284
.withPassword("foo");
291285
})
292286
)

0 commit comments

Comments
 (0)