From da7f8b5dfd05300e50ea8802b93f53e6d38f24ec Mon Sep 17 00:00:00 2001
From: Ben Jackson <b@benjackson.email>
Date: Thu, 15 Aug 2019 13:18:15 +1000
Subject: [PATCH] add new configuration options, set env defaults to match
 elastic defaults

---
 images/elasticsearch/Dockerfile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/images/elasticsearch/Dockerfile b/images/elasticsearch/Dockerfile
index ca744d0d11..9863398e41 100644
--- a/images/elasticsearch/Dockerfile
+++ b/images/elasticsearch/Dockerfile
@@ -39,13 +39,24 @@ RUN echo $'xpack.security.enabled: false\n\
 \n\
 node.name: "${HOSTNAME}"\n\
 node.master: "${NODE_MASTER}"\n\
+node.data: "${NODE_DATA}"\n\
+node.ingest: "${NODE_INGEST}"\n\
+node.ml: "${NODE_ML}"\n\
+xpack.ml.enabled: "${XPACK_ML_ENABLED}"\n\
+cluster.remote.connect: "${CLUSTER_REMOTE_CONNECT}"\n\
 discovery.zen.minimum_master_nodes: "${DISCOVERY_ZEN_MINIMUM_MASTER_NODES}"' >> config/elasticsearch.yml
 
 RUN fix-permissions config
 
 ENV ES_JAVA_OPTS="-Xms200m -Xmx200m" \
     DISCOVERY_ZEN_MINIMUM_MASTER_NODES=1 \
-    NODE_MASTER=true
+    NODE_MASTER=true \
+    NODE_DATA=true \
+    NODE_INGEST=true \
+    NODE_ML=true \
+    XPACK_ML_ENABLED=true \
+    CLUSTER_REMOTE_CONNECT=true
+
 
 VOLUME [ "/usr/share/elasticsearch/data" ]