Upgrade Elasticsearch/Kibana to 5.5.1 and use official Kibana image

cluster/addons/fluentd-elasticsearch/es-image/Dockerfile

@@ -12,43 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# A Dockerfile for creating an Elasticsearch instance that is designed
-# to work with Kubernetes logging. Inspired by the Dockerfile
-# dockerfile/elasticsearch
+FROM docker.elastic.co/elasticsearch/elasticsearch:5.5.1
 
-FROM java:openjdk-8-jre-alpine
+USER root
 
+RUN mkdir /data
+RUN chown -R elasticsearch:elasticsearch /data
 
-ENV DEBIAN_FRONTEND noninteractive
-ENV ELASTICSEARCH_VERSION 5.4.0
-
-RUN apk update && \
-    apk --no-cache add \
-        --repository https://dl-3.alpinelinux.org/alpine/edge/testing \
-        --repository https://dl-3.alpinelinux.org/alpine/edge/community \
-        curl \
-        shadow \
-        tar \
-        gosu
-
-RUN set -x \
-    && cd / \
-    && mkdir /elasticsearch \
-    && curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.tar.gz \
-    && tar xf elasticsearch-$ELASTICSEARCH_VERSION.tar.gz -C /elasticsearch --strip-components=1 \
-    && rm elasticsearch-$ELASTICSEARCH_VERSION.tar.gz
-
-COPY config /elasticsearch/config
-
-COPY run.sh /
-COPY elasticsearch_logging_discovery /
-
-RUN useradd --no-create-home --user-group elasticsearch \
-    && mkdir /data \
-    && chown -R elasticsearch:elasticsearch /elasticsearch
-
+WORKDIR /usr/share/elasticsearch
 
 VOLUME ["/data"]
 EXPOSE 9200 9300
 
-CMD ["/run.sh"]
+USER elasticsearch
+COPY elasticsearch_logging_discovery bin/
+COPY config/elasticsearch.yml config/
+COPY config/log4j2.properties config/
+COPY run.sh bin/
+
+USER root
+RUN chown -R elasticsearch:elasticsearch config
+CMD ["bin/run.sh"]

cluster/addons/fluentd-elasticsearch/es-image/Makefile

@@ -16,7 +16,7 @@
 
 # The current value of the tag to be used for building and
 # pushing an image to gcr.io
-TAG = v5.4.0-1
+TAG = v5.5.1
 
 build:	elasticsearch_logging_discovery
 	docker build --pull -t gcr.io/google_containers/elasticsearch:$(TAG) .

cluster/addons/fluentd-elasticsearch/es-image/config/log4j2.properties

@@ -1,4 +1,3 @@
-# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
 status = error
 
 appender.console.type = Console

cluster/addons/fluentd-elasticsearch/es-image/run.sh

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sysctl -w vm.max_map_count=262144
+set -ex
 
 export NODE_NAME=${NODE_NAME:-${HOSTNAME}}
 export NODE_MASTER=${NODE_MASTER:-true}
@@ -23,8 +23,7 @@ export HTTP_PORT=${HTTP_PORT:-9200}
 export TRANSPORT_PORT=${TRANSPORT_PORT:-9300}
 export MINIMUM_MASTER_NODES=${MINIMUM_MASTER_NODES:-2}
 
-/elasticsearch_logging_discovery >> /elasticsearch/config/elasticsearch.yml
-
 chown -R elasticsearch:elasticsearch /data
 
-exec gosu elasticsearch sh /elasticsearch/bin/elasticsearch
+./bin/elasticsearch_logging_discovery >> ./config/elasticsearch.yml
+exec su elasticsearch -c ./bin/es-docker