Skip to content

Commit

Permalink
Fix for mastodon#18637 - Migrate from elasticsearch-oss to elasticsea…
Browse files Browse the repository at this point in the history
…rch basic (mastodon#18643)

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml
  • Loading branch information
shleeable authored Jun 15, 2022
1 parent af9d7a2 commit cc7cebb
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -41,6 +48,11 @@ services:
# memlock:
# soft: -1
# hard: -1
# nofile:
# soft: 65536
# hard: 65536
# ports:
# - '127.0.0.1:9200:9200'

web:
build: .
Expand Down

0 comments on commit cc7cebb

Please sign in to comment.