[es] small command line fix (#117)

small command line fix

cassandra/Dockerfile

@@ -2,9 +2,9 @@ FROM java:openjdk-8u72-jdk
 
 MAINTAINER itzg
 
-ENV CASSANDRA_VERSION 2.2.7
+ENV CASSANDRA_VERSION 2.2.8
 
-RUN wget -qO /tmp/apache-cassandra.tgz http://mirrors.ibiblio.org/apache/cassandra/$CASSANDRA_VERSION/apache-cassandra-$CASSANDRA_VERSION-bin.tar.gz
+ADD http://mirrors.ibiblio.org/apache/cassandra/$CASSANDRA_VERSION/apache-cassandra-$CASSANDRA_VERSION-bin.tar.gz /tmp/apache-cassandra.tgz
 RUN tar -C /opt -zxf /tmp/apache-cassandra.tgz && \
   rm /tmp/apache-cassandra.tgz
 

elasticsearch/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER itzg
 
 RUN apk -U add bash
 
-ENV ES_VERSION=5.0.0
+ENV ES_VERSION=5.0.2
 
 ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz /tmp/es.tgz
 RUN cd /usr/share && \
@@ -16,7 +16,8 @@ EXPOSE 9200 9300
 ENV ES_HOME=/usr/share/elasticsearch-$ES_VERSION \
     DEFAULT_ES_USER=elasticsearch \
     DISCOVER_TRANSPORT_IP=eth0 \
-    DISCOVER_HTTP_IP=eth0
+    DISCOVER_HTTP_IP=eth0 \
+    ES_JAVA_OPTS="-Xms1g -Xmx1g"
 
 RUN adduser -S -s /bin/sh $DEFAULT_ES_USER
 

elasticsearch/README.md

@@ -29,9 +29,9 @@ Where `DOCKERHOST` would be the actual hostname of your host running Docker.
 
 To run a multi-node cluster (3-node in this example) on a single Docker machine use:
 
-    docker run -d --name es0 -p 9200:9200                    es
-    docker run -d --name es1 --link es0 -e UNICAST_HOSTS=es0 es
-    docker run -d --name es2 --link es0 -e UNICAST_HOSTS=es0 es
+    docker run -d --name es0 -p 9200:9200                    itzg/elasticsearch
+    docker run -d --name es1 --link es0 -e UNICAST_HOSTS=es0 itzg/elasticsearch
+    docker run -d --name es2 --link es0 -e UNICAST_HOSTS=es0 itzg/elasticsearch
 
 
 and then check the cluster health, such as http://192.168.99.100:9200/_cluster/health?pretty
@@ -197,3 +197,17 @@ replacing `eth0` with another interface within the container, if needed.
 The same can be done for publish/binding of the http module by adding:
 
     -e DISCOVERY_HTTP_IP=eth2
+
+## Heap size and other JVM options
+
+By default this image will run Elasticsearch with a Java heap size of 1 GB. If that value
+or any other JVM options need to be adjusted, then replace the `ES_JAVA_OPTS`
+environment variable.
+
+For example, this would allow for the use of 16 GB of heap:
+
+    -e ES_JAVA_OPTS="-Xms16g -Xmx16g"
+
+Refer to [this page](https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html)
+for more information about why both the minimum and maximum sizes were set to
+the same value.

elasticsearch/start

@@ -125,7 +125,7 @@ echo "Starting Elasticsearch with the options $OPTS"
 CMD="$ES_HOME/bin/elasticsearch $OPTS"
 if [ `id -u` = 0 ]; then
   echo "Running as non-root..."
-  chown -R $DEFAULT_ES_USER /data
+  chown -R $DEFAULT_ES_USER /data /conf
   su -c "$CMD" $DEFAULT_ES_USER
 else
   $CMD

kibana/Dockerfile

@@ -2,7 +2,7 @@ FROM openjdk:8u111-jre
 
 MAINTAINER itzg
 
-ENV KIBANA_VERSION 5.0.0
+ENV KIBANA_VERSION 5.0.2
 
 ADD https://artifacts.elastic.co/downloads/kibana/kibana-${KIBANA_VERSION}-linux-x86_64.tar.gz /tmp/kibana.tgz
 

kibana/start.sh

@@ -3,4 +3,3 @@
 OPTS="-e $ES_URL -H $HOSTNAME"
 
 exec bin/kibana $OPTS
-