From b3dc30dff8adeac3a2214095faaf659a21e246ce Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 13 Feb 2017 17:45:09 +0530
Subject: [PATCH] config: move default config var to Dockerfile

---
 bitnami/elasticsearch/Dockerfile               | 4 ++++
 bitnami/elasticsearch/rootfs/app-entrypoint.sh | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bitnami/elasticsearch/Dockerfile b/bitnami/elasticsearch/Dockerfile
index 9157497a01cb..2bb6447e621c 100644
--- a/bitnami/elasticsearch/Dockerfile
+++ b/bitnami/elasticsearch/Dockerfile
@@ -17,6 +17,10 @@ RUN bitnami-pkg unpack elasticsearch-2.4.4-0 --checksum 3c05a4da328a904cf3a694e3
 
 COPY rootfs /
 
+ENV ELASTICSEARCH_PORT="9200" \
+    ELASTICSEARCH_NODE_PORT="9300" \
+    ELASTICSEARCH_CLUSTER_NAME="elasticsearch-cluster"
+
 VOLUME ["/bitnami/elasticsearch"]
 
 EXPOSE 9200 9300
diff --git a/bitnami/elasticsearch/rootfs/app-entrypoint.sh b/bitnami/elasticsearch/rootfs/app-entrypoint.sh
index 67a523e200e3..a59987ca07cf 100755
--- a/bitnami/elasticsearch/rootfs/app-entrypoint.sh
+++ b/bitnami/elasticsearch/rootfs/app-entrypoint.sh
@@ -14,11 +14,6 @@ function initialize {
     fi
 }
 
-# Set default values
-export ELASTICSEARCH_PORT=${ELASTICSEARCH_PORT:-"9200"}
-export ELASTICSEARCH_NODE_PORT=${ELASTICSEARCH_NODE_PORT:-"9300"}
-export ELASTICSEARCH_CLUSTER_NAME=${ELASTICSEARCH_CLUSTER_NAME:-"elasticsearch-cluster"}
-
 if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
    initialize elasticsearch
    echo "Starting application ..."