Move elasticsearch to compose.elasticsearch.yml (#15)
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
I realised although I had created compose.elasticsearch.yml I had only moved the env vars into it, not the actual service. Now moved the service and the volume :) I haven't tried it, but will do soon for bath.social... Co-authored-by: Nick Sellen <git@nicksellen.co.uk> Reviewed-on: #15
This commit is contained in:
parent
86bef2441d
commit
307037b36b
@ -2,6 +2,22 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
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:
|
app:
|
||||||
environment: &es-env
|
environment: &es-env
|
||||||
- ES_ENABLED=true
|
- ES_ENABLED=true
|
||||||
@ -13,3 +29,6 @@ services:
|
|||||||
|
|
||||||
sidekiq:
|
sidekiq:
|
||||||
environment: *es-env
|
environment: *es-env
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
es:
|
17
compose.yml
17
compose.yml
@ -194,22 +194,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- redis:/data
|
- 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:
|
secrets:
|
||||||
secret_key_base:
|
secret_key_base:
|
||||||
name: ${STACK_NAME}_secret_key_base_${SECRET_SECRET_KEY_BASE_VERSION}
|
name: ${STACK_NAME}_secret_key_base_${SECRET_SECRET_KEY_BASE_VERSION}
|
||||||
@ -231,7 +215,6 @@ volumes:
|
|||||||
app:
|
app:
|
||||||
redis:
|
redis:
|
||||||
postgres:
|
postgres:
|
||||||
es:
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
|
Loading…
Reference in New Issue
Block a user