Merge pull request #1188 from shreddedbacon/elastic-config

Even more configuration for elasticsearch
uselagoon · Aug 16, 2019 · fca014e · fca014e
2 parents 3baa468 + 383d078
commit fca014e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/images/elasticsearch/Dockerfile b/images/elasticsearch/Dockerfile
@@ -55,7 +55,8 @@ ENV ES_JAVA_OPTS="-Xms200m -Xmx200m" \
     NODE_INGEST=true \
     NODE_ML=true \
     XPACK_ML_ENABLED=true \
-    CLUSTER_REMOTE_CONNECT=true
+    CLUSTER_REMOTE_CONNECT=true \
+    EXTRA_OPTS=""
 
 
 VOLUME [ "/usr/share/elasticsearch/data" ]

diff --git a/images/elasticsearch/docker-entrypoint.sh b/images/elasticsearch/docker-entrypoint.sh
@@ -2,6 +2,10 @@
 
 set -eo pipefail
 
+if [ ! -z "$EXTRA_OPTS" ]; then
+  echo -e "${EXTRA_OPTS}" >> /usr/share/elasticsearch/config/elasticsearch.yml
+fi
+
 if [ -z "$POD_NAMESPACE" ]; then
   # Single container runs in docker
   echo "POD_NAMESPACE not set, spin up single node"
@@ -13,4 +17,4 @@ else
   echo "Using service name: ${K8S_SVC_NAME}"
   # copy the pristine version to the one that can be edited
   /usr/bin/peer-finder -on-start="/lagoon/configure-es.sh" -service=${K8S_SVC_NAME}
-fi
+fi