From: Shlee <github@shl.ee>
Date: Wed, 10 Jun 2020 11:57:30 +0000 (+0800)
Subject: Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348)... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=91055f497f0cafa66b928fea717813114c4e8b99;p=mastodon.git

Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) (#14016)

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml
---

diff --git a/docker-compose.yml b/docker-compose.yml
index e190df6d6..52eea7a74 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,15 +24,22 @@ services:
 
 #  es:
 #    restart: always
-#    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.3
+#    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
 #    environment:
 #      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+#      - "cluster.name=es-mastodon"
+#      - "discovery.type=single-node"
+#      - "bootstrap.memory_lock=true"
 #    networks:
 #      - internal_network
 #    healthcheck:
 #      test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
 #    volumes:
 #      - ./elasticsearch:/usr/share/elasticsearch/data
+#    ulimits:
+#      memlock:
+#        soft: -1
+#        hard: -1
 
   web:
     build: .