diff options
| author | Shlee <github@shl.ee> | 2020-06-10 19:57:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 13:57:30 +0200 |
| commit | 91055f497f0cafa66b928fea717813114c4e8b99 (patch) | |
| tree | c7afe8bdffbed5d8625159aa3cc3ef75b9166287 | |
| parent | c813789e06e485f8f3d013b55d1d6ecf9a682a02 (diff) | |
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
| -rw-r--r-- | docker-compose.yml | 9 |
1 files changed, 8 insertions, 1 deletions
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: . |