Try to get ES in the mix
This commit is contained in:
parent
18eac8b5e0
commit
57cdd8e23f
@ -59,12 +59,11 @@ REDIS_PORT=6379
|
|||||||
# CACHE_REDIS_URL=
|
# CACHE_REDIS_URL=
|
||||||
# CACHE_REDIS_NAMESPACE=
|
# CACHE_REDIS_NAMESPACE=
|
||||||
|
|
||||||
# ElasticSearch (CURRENTLY NOT SUPPORTED)
|
# ElasticSearch
|
||||||
# --------------------------------------
|
# --------------------------------------
|
||||||
ES_ENABLED=false
|
ES_ENABLED=true
|
||||||
# ES_HOST=localhost
|
ES_HOST=es
|
||||||
# ES_PORT=9200
|
ES_PORT=9200
|
||||||
# ES_PREFIX=
|
|
||||||
|
|
||||||
# StatsD (CURRENTLY NOT SUPPORTED)
|
# StatsD (CURRENTLY NOT SUPPORTED)
|
||||||
# -------------------------------
|
# -------------------------------
|
||||||
|
37
compose.yml
37
compose.yml
@ -23,24 +23,23 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- redis:/data
|
- redis:/data
|
||||||
|
|
||||||
# es:
|
es:
|
||||||
# restart: always
|
image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
|
||||||
# image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
|
environment:
|
||||||
# environment:
|
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
|
||||||
# - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
|
- "cluster.name=es-mastodon"
|
||||||
# - "cluster.name=es-mastodon"
|
- "discovery.type=single-node"
|
||||||
# - "discovery.type=single-node"
|
- "bootstrap.memory_lock=true"
|
||||||
# - "bootstrap.memory_lock=true"
|
networks:
|
||||||
# networks:
|
- internal_network
|
||||||
# - internal_network
|
healthcheck:
|
||||||
# healthcheck:
|
test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
|
||||||
# test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
|
volumes:
|
||||||
# volumes:
|
- es:/usr/share/elasticsearch/data
|
||||||
# - ./elasticsearch:/usr/share/elasticsearch/data
|
ulimits:
|
||||||
# ulimits:
|
memlock:
|
||||||
# memlock:
|
soft: -1
|
||||||
# soft: -1
|
hard: -1
|
||||||
# hard: -1
|
|
||||||
|
|
||||||
web:
|
web:
|
||||||
image: &image tootsuite/mastodon:v3.3.0
|
image: &image tootsuite/mastodon:v3.3.0
|
||||||
@ -224,6 +223,8 @@ volumes:
|
|||||||
app:
|
app:
|
||||||
redis:
|
redis:
|
||||||
postgres:
|
postgres:
|
||||||
|
es:
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
|
Loading…
Reference in New Issue
Block a user