Merge branch 'main' of ssh://git.autonomic.zone:2222/coop-cloud/mastodon into main

This commit is contained in:
decentral1se 2021-05-28 13:44:29 +02:00
commit 5b7cbedecb
Signed by untrusted user who does not match committer: decentral1se
GPG Key ID: 92DAD76BD9567B8A

View File

@ -26,23 +26,23 @@ services:
volumes: volumes:
- redis:/data - redis:/data
es: es:
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 - es:/usr/share/elasticsearch/data
ulimits: ulimits:
memlock: memlock:
soft: -1 soft: -1
hard: -1 hard: -1
web: web:
image: &image decentral1se/hometown:v1.0.5_3.4.0 image: &image decentral1se/hometown:v1.0.5_3.4.0