Bump elasticsearch to 5.3.1

Dockerfile

@@ -1,15 +1,24 @@
 FROM ubuntu:trusty
 
 RUN apt-get update ;\
-    apt-get install -y curl openjdk-7-jre-headless supervisor ;\
-    curl -o /tmp/elasticsearch.deb "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.2.0/elasticsearch-2.2.0.deb" ;\
+    apt-get install -y software-properties-common ;\
+    add-apt-repository -y ppa:webupd8team/java ;\
+    apt-get update ;\
+    echo "debconf shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections;\
+    apt-get install -y oracle-java9-installer ;\
+    rm -rf /var/lib/apt/lists/*
+
+RUN apt-get update ;\
+    apt-get install -y curl supervisor ;\
+    curl -o /tmp/elasticsearch.deb "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.3.1.deb" ;\
     dpkg -i /tmp/elasticsearch.deb ;\
     rm /tmp/elasticsearch.deb ;\
     rm -rf /var/lib/apt/lists/*
 
 ADD elasticsearch.conf /etc/supervisor/conf.d/elasticsearch.conf
-ADD supervisor.conf /etc/supervisor/conf.d/supervisor.conf
+ADD start /start
 
 VOLUME /var/lib/elasticsearch/
-ENTRYPOINT ["supervisord"]
+ENTRYPOINT ["/start"]
 EXPOSE 9200 9300
+USER elasticsearch

README.md

@@ -1,13 +1,17 @@
-docker-elasticsearch2
-=====================
+docker-elasticsearch
+====================
 
-Container for running [Elasticsearch 2.x](https://www.elastic.co/products/elasticsearch).
+The latest [Elasticsearch](https://www.elastic.co/products/elasticsearch) for docker, currently 5.3.1.
 
 *Usage:*
 
 * Build: `docker build -t elasticsearch .`
 * Run: `docker run -d -v /data/elastic:/var/lib/elasticsearch -p 9300:9300 -p 9200:9200 elasticsearch`
 
-*Extras:*
+Note: you'll need to increase vm.max_map_count; Elasticsearch will demand it. Either add
+`--sysctl vm.max_map_count=262144` to the `docker run` command or use `sysctl -w vm.max_map_count=262144`.
+
+*Notes:*
 
 * Override default config file: `-v /data/myconfig.yml:/etc/elasticsearch/elasticsearch.yml`
+* Data is stored in `/var/lib/elasticsearch`

start

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+exec /usr/share/elasticsearch/bin/elasticsearch \
+    -p /var/run/elasticsearch/elasticsearch.pid \
+    -E default.path.home=/usr/share/elasticsearch \
+    -E default.path.logs=/var/log/elasticsearch \
+    -E default.path.data=/var/lib/elasticsearch \
+    -E default.path.conf=/etc/elasticsearch \
+    -E network.host=0.0.0.0 $@

supervisor.conf

@@ -1,2 +0,0 @@
-[supervisord]
-nodaemon=true