From b3a79d6b081e0850c02cb0306f0a8d5c91e6c6dc Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Thu, 29 Oct 2015 19:58:28 -0500
Subject: [PATCH] [es] Upgrade to 2.0.0

---
 elasticsearch/Dockerfile | 6 ++++--
 elasticsearch/README.md  | 8 ++++++++
 elasticsearch/start      | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index db8b9fbc..02615a1f 100755
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -2,9 +2,9 @@ FROM itzg/ubuntu-openjdk-7
 
 MAINTAINER itzg
 
-ENV ES_VERSION 1.7.3
+ENV ES_VERSION 2.0.0
 
-RUN wget -qO /tmp/es.tgz https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ES_VERSION.tar.gz && \
+RUN wget -qO /tmp/es.tgz https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/$ES_VERSION/elasticsearch-$ES_VERSION.tar.gz && \
   cd /usr/share && \
   tar xf /tmp/es.tgz && \
   rm /tmp/es.tgz
@@ -23,4 +23,6 @@ USER elasticsearch
 
 EXPOSE 9200 9300
 
+ENV OPTS=-Dnetwork.bind_host=_non_loopback_
+
 CMD ["/start"]
diff --git a/elasticsearch/README.md b/elasticsearch/README.md
index a8a9742f..a256c5a1 100755
--- a/elasticsearch/README.md
+++ b/elasticsearch/README.md
@@ -82,6 +82,14 @@ The contents of the `/conf/env` file are standard shell
 
 entries where `NAME` is one of the variables described below.
 
+Configuration options not explicitly supported below can be specified via the `OPTS` environment variable. For
+example, by default `OPTS` is set with
+
+    OPTS=-Dnetwork.bind_host=_non_loopback_
+
+_NOTE: That option is a default since `bind_host` defaults to `localhost` as of 2.0, which isn't helpful for
+port mapping out from the container_.
+
 ## Cluster Name
 
 If joining a pre-existing cluster, then you may need to specify a cluster name
diff --git a/elasticsearch/start b/elasticsearch/start
index 154f9e98..5268e280 100755
--- a/elasticsearch/start
+++ b/elasticsearch/start
@@ -12,7 +12,7 @@ if [ ! -e /conf/logging.* ]; then
   cp $ES_HOME/config/logging.yml /conf
 fi
 
-OPTS="-Des.path.conf=/conf \
+OPTS="$OPTS -Des.path.conf=/conf \
   -Des.path.data=/data \
   -Des.path.logs=/data \
   -Des.transport.tcp.port=9300 \