archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

Elastic: moved memory limit to environment variable

Browse Source 
This allows us to easily change it without rebuilding the Docker image.
This commit is contained in:
Sybren A. Stüvel
2017-09-21 11:38:17 +02:00
parent 8e6fc604e3
commit 98177df7bd
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/docker-compose.yml
View File

@@ -28,6 +28,8 @@ elastic:
- /data/storage/elastic:/usr/share/elasticsearch/data - /data/storage/elastic:/usr/share/elasticsearch/data
ports: ports:
- "127.0.0.1:9200:9200" - "127.0.0.1:9200:9200"
environment:
ES_JAVA_OPTS: "-Xms256m -Xmx256m"
kibana: kibana:
image: armadillica/kibana:latest image: armadillica/kibana:latest
container_name: kibana container_name: kibana
@@ -133,8 +135,8 @@ haproxy:
- CERT_FOLDER=/certs/ - CERT_FOLDER=/certs/
- TIMEOUT=connect 5s, client 5m, server 10m - TIMEOUT=connect 5s, client 5m, server 10m
links: links:
- blender_cloud # - blender_cloud
- grafista # - grafista
# - notifserv # - notifserv
- letsencrypt - letsencrypt
- kibana - kibana

6
docker/elastic/jvm.options
View File

@@ -19,9 +19,9 @@
# Xms represents the initial size of total heap space # Xms represents the initial size of total heap space
# Xmx represents the maximum size of total heap space # Xmx represents the maximum size of total heap space
# Sybren: changed from 2g to 512m # Sybren: uncommented so that we can set those options using the ES_JAVA_OPTS environment variable.
-Xms512m #-Xms512m
-Xmx512m #-Xmx512m
################################################################ ################################################################
## Expert settings ## Expert settings