From 98177df7bd11f38e073a7cde848b88f7622b1416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Thu, 21 Sep 2017 11:38:17 +0200
Subject: [PATCH] Elastic: moved memory limit to environment variable

This allows us to easily change it without rebuilding the Docker image.
---
 docker/docker-compose.yml  | 6 ++++--
 docker/elastic/jvm.options | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4685775..9b812e8 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -28,6 +28,8 @@ elastic:
         - /data/storage/elastic:/usr/share/elasticsearch/data
     ports:
         - "127.0.0.1:9200:9200"
+    environment:
+        ES_JAVA_OPTS: "-Xms256m -Xmx256m"
 kibana:
     image: armadillica/kibana:latest
     container_name: kibana
@@ -133,8 +135,8 @@ haproxy:
    - CERT_FOLDER=/certs/
    - TIMEOUT=connect 5s, client 5m, server 10m
   links:
-   - blender_cloud
-   - grafista
+   # - blender_cloud
+   # - grafista
    # - notifserv
    - letsencrypt
    - kibana
diff --git a/docker/elastic/jvm.options b/docker/elastic/jvm.options
index 490fef1..e0a4c3f 100644
--- a/docker/elastic/jvm.options
+++ b/docker/elastic/jvm.options
@@ -19,9 +19,9 @@
 # Xms represents the initial size of total heap space
 # Xmx represents the maximum size of total heap space
 
-# Sybren: changed from 2g to 512m
--Xms512m
--Xmx512m
+# Sybren: uncommented so that we can set those options using the ES_JAVA_OPTS environment variable.
+#-Xms512m
+#-Xmx512m
 
 ################################################################
 ## Expert settings