diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-17 18:28:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 18:28:28 +0200 |
| commit | c7da2cc5a1821e589e7241aec21d8bb426722c2a (patch) | |
| tree | e61b37ed8d8c5a8446cf656600c90c85ccdc983c /docker-compose.yml | |
| parent | 0a5cf075cdddbbe40e79ebad8ee2b1abd62d3200 (diff) | |
| parent | 9a641a5a0e7a8d45bf6d3b8e4bfdc269def2dc06 (diff) | |
Merge pull request #1358 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to '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: . |