Java upgrade (Fix #21) and entry point wrapper.

Dockerfile

@@ -5,29 +5,30 @@
 #
 
 # Pull base image.
-FROM dockerfile/java:oracle-java8
+FROM ggtools/java8
 
 ENV ES_PKG_NAME elasticsearch-1.4.2
 
 # Install Elasticsearch.
 RUN \
   cd / && \
-  wget https://download.elasticsearch.org/elasticsearch/elasticsearch/$ES_PKG_NAME.tar.gz && \
-  tar xvzf $ES_PKG_NAME.tar.gz && \
-  rm -f $ES_PKG_NAME.tar.gz && \
+  curl -k https://download.elasticsearch.org/elasticsearch/elasticsearch/$ES_PKG_NAME.tar.gz | \
+  tar -xvzf - && \
   mv /$ES_PKG_NAME /elasticsearch
 
 # Define mountable directories.
 VOLUME ["/data"]
 
 # Mount elasticsearch.yml config
 ADD config/elasticsearch.yml /elasticsearch/config/elasticsearch.yml
+ADD docker-entry-point.sh /elasticsearch/bin/docker-entry-point.sh
 
 # Define working directory.
 WORKDIR /data
 
 # Define default command.
-CMD ["/elasticsearch/bin/elasticsearch"]
+ENTRYPOINT [ "/elasticsearch/bin/docker-entry-point.sh" ]
+CMD [""]
 
 # Expose ports.
 #   - 9200: HTTP

README.md

@@ -6,7 +6,7 @@ This repository contains **Dockerfile** of [Elasticsearch](http://www.elasticsea
 
 ### Base Docker Image
 
-* [dockerfile/java:oracle-java8](http://dockerfile.github.io/#/java)
+* [ggtools/java8](https://registry.hub.docker.com/u/ggtools/java8)
 
 
 ### Installation
@@ -37,7 +37,7 @@ This repository contains **Dockerfile** of [Elasticsearch](http://www.elasticsea
   3. Start a container by mounting data directory and specifying the custom configuration file:
 
     ```sh
-    docker run -d -p 9200:9200 -p 9300:9300 -v <data-dir>:/data dockerfile/elasticsearch /elasticsearch/bin/elasticsearch -Des.config=/data/elasticsearch.yml
+    docker run -d -p 9200:9200 -p 9300:9300 -v <data-dir>:/data dockerfile/elasticsearch -Des.config=/data/elasticsearch.yml
     ```
 
 After few seconds, open `http://<host>:9200` to see the result.

docker-entry-point.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ -z "$1" -o  "${1:0:1}" = '-' ]; then
+  chown -R default /data
+
+  exec gosu default /elasticsearch/bin/elasticsearch "$@"
+fi
+
+exec "$@"