Move elasticsearch to compose.elasticsearch.yml #15

Merged
nicksellen merged 1 commits from fix/es into main 2023-07-20 12:51:42 +00:00
2 changed files with 19 additions and 17 deletions

View File

@ -2,6 +2,22 @@
version: "3.8"
services:
es:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "cluster.name=es-mastodon"
- "discovery.type=single-node"
- "bootstrap.memory_lock=true"
networks:
- internal_network
volumes:
- es:/usr/share/elasticsearch/data
ulimits:
memlock:
soft: -1
hard: -1
app:
environment: &es-env
- ES_ENABLED=true
@ -13,3 +29,6 @@ services:
sidekiq:
environment: *es-env
volumes:
es:

View File

@ -194,22 +194,6 @@ services:
volumes:
- redis:/data
es:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "cluster.name=es-mastodon"
- "discovery.type=single-node"
- "bootstrap.memory_lock=true"
networks:
- internal_network
volumes:
- es:/usr/share/elasticsearch/data
ulimits:
memlock:
soft: -1
hard: -1
secrets:
secret_key_base:
name: ${STACK_NAME}_secret_key_base_${SECRET_SECRET_KEY_BASE_VERSION}
@ -231,7 +215,6 @@ volumes:
app:
redis:
postgres:
es:
networks:
proxy: