From 29495fb84b53d82a517a19e55788467f52afa821 Mon Sep 17 00:00:00 2001
From: dave <dave@davepedu.com>
Date: Fri, 21 Apr 2017 00:36:14 -0700
Subject: [PATCH] Provide overridable default memory setting

---
 Dockerfile | 1 +
 README.md  | 1 +
 start      | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 35595e1..a9ed64d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update ;\
     curl -o /tmp/elasticsearch.deb "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.3.1.deb" ;\
     dpkg -i /tmp/elasticsearch.deb ;\
     rm /tmp/elasticsearch.deb ;\
+    sed -i -E 's/(\-Xm.[0-9]g)/#\1/' /etc/elasticsearch/jvm.options ;\
     rm -rf /var/lib/apt/lists/*
 
 ADD elasticsearch.conf /etc/supervisor/conf.d/elasticsearch.conf
diff --git a/README.md b/README.md
index 1ca2d07..011751b 100644
--- a/README.md
+++ b/README.md
@@ -15,3 +15,4 @@ Note: you'll need to increase vm.max_map_count; Elasticsearch will demand it. Ei
 
 * Override default config file: `-v /data/myconfig.yml:/etc/elasticsearch/elasticsearch.yml`
 * Data is stored in `/var/lib/elasticsearch`
+* Set memory limit like so: `-e "ES_JAVA_OPTS=-Xms8G -Xmx8G"
diff --git a/start b/start
index cf7d603..05977cf 100755
--- a/start
+++ b/start
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+export ES_JAVA_OPTS="${ES_JAVA_OPTS:--Xms1G -Xmx1G}"
+
 exec /usr/share/elasticsearch/bin/elasticsearch \
     -p /var/run/elasticsearch/elasticsearch.pid \
     -E default.path.home=/usr/share/elasticsearch \