From cc7cebb79a2a9ed284e027b76d1038afb4f2a6ef Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Wed, 15 Jun 2022 14:35:36 +0000
Subject: [PATCH] Fix for #18637 - Migrate from elasticsearch-oss to
elasticsearch basic (#18643)
* Update docker-compose.yml
* Update docker-compose.yml
* Update docker-compose.yml
---
docker-compose.yml | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index b324a65b0..d86cb55d2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,13 +25,20 @@ services:
# es:
# restart: always
- # image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.17.4
+ # image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4
# environment:
- # - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+ # - "ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true"
+ # - "xpack.license.self_generated.type=basic"
+ # - "xpack.security.enabled=false"
+ # - "xpack.watcher.enabled=false"
+ # - "xpack.graph.enabled=false"
+ # - "xpack.ml.enabled=false"
+ # - "bootstrap.memory_lock=true"
# - "cluster.name=es-mastodon"
# - "discovery.type=single-node"
- # - "bootstrap.memory_lock=true"
+ # - "thread_pool.write.queue_size=1000"
# networks:
+ # - external_network
# - internal_network
# healthcheck:
# test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
@@ -41,6 +48,11 @@ services:
# memlock:
# soft: -1
# hard: -1
+ # nofile:
+ # soft: 65536
+ # hard: 65536
+ # ports:
+ # - '127.0.0.1:9200:9200'
web:
build: .