From 6e088352d8fe355b1d9ff6fc017d658ee7a193f5 Mon Sep 17 00:00:00 2001
From: Richard Lister <rlister+gh@gmail.com>
Date: Tue, 19 May 2015 22:12:01 -0400
Subject: [PATCH] build kibana 4.0.2

---
 kibana4/{ => 4.0.0-beta3}/Dockerfile |  0
 kibana4/{ => 4.0.0-beta3}/config.sh  |  0
 kibana4/4.0.2/Dockerfile             | 26 ++++++++++++++++++++++++++
 kibana4/4.0.2/config.sh              | 14 ++++++++++++++
 kibana4/README.md                    |  2 +-
 5 files changed, 41 insertions(+), 1 deletion(-)
 rename kibana4/{ => 4.0.0-beta3}/Dockerfile (100%)
 rename kibana4/{ => 4.0.0-beta3}/config.sh (100%)
 create mode 100644 kibana4/4.0.2/Dockerfile
 create mode 100644 kibana4/4.0.2/config.sh

diff --git a/kibana4/Dockerfile b/kibana4/4.0.0-beta3/Dockerfile
similarity index 100%
rename from kibana4/Dockerfile
rename to kibana4/4.0.0-beta3/Dockerfile
diff --git a/kibana4/config.sh b/kibana4/4.0.0-beta3/config.sh
similarity index 100%
rename from kibana4/config.sh
rename to kibana4/4.0.0-beta3/config.sh
diff --git a/kibana4/4.0.2/Dockerfile b/kibana4/4.0.2/Dockerfile
new file mode 100644
index 0000000..da8568d
--- /dev/null
+++ b/kibana4/4.0.2/Dockerfile
@@ -0,0 +1,26 @@
+FROM debian:jessie
+
+MAINTAINER Ric Lister, rlister@gmail.com
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -yq \
+    openjdk-7-jre-headless \
+    wget
+
+WORKDIR /app
+
+ENV KIBANA_VERSION 4.0.2-linux-x64
+
+RUN cd /tmp && \
+    wget -q https://download.elasticsearch.org/kibana/kibana/kibana-${KIBANA_VERSION}.tar.gz && \
+    tar zxf /tmp/kibana-${KIBANA_VERSION}.tar.gz -C /app --strip-components=1 && \
+    rm -f /tmp/kibana-${KIBANA_VERSION}.tar.gz
+
+EXPOSE 5601
+
+## sub env vars into config file
+ADD config.sh /app/
+ENTRYPOINT [ "sh", "./config.sh" ]
+
+CMD [ "bin/kibana" ]
diff --git a/kibana4/4.0.2/config.sh b/kibana4/4.0.2/config.sh
new file mode 100644
index 0000000..b4dbdc7
--- /dev/null
+++ b/kibana4/4.0.2/config.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+## substitute values in config file if any of these env vars are set
+[ -z "$PORT" ]              || sed -ri "s|^(port):.*|\1: ${PORT}|"                               config/kibana.yml
+[ -z "$HOST" ]              || sed -ri "s|^(host):.*|\1: \"${HOST}\"|"                           config/kibana.yml
+[ -z "$ELASTICSEARCH_URL" ] || sed -ri "s|^(elasticsearch_url):.*|\1: \"${ELASTICSEARCH_URL}\"|" config/kibana.yml
+[ -z "$KIBANA_INDEX" ]      || sed -ri "s|^(kibana_index):.*|\1: \"${KIBANA_INDEX}\"|"           config/kibana.yml
+[ -z "$DEFAULT_APP_ID" ]    || sed -ri "s|^(default_app_id):.*|\1: \"${DEFAULT_APP_ID}\"|"       config/kibana.yml
+[ -z "$REQUEST_TIMEOUT" ]   || sed -ri "s|^(request_timeout):.*|\1: ${REQUEST_TIMEOUT}|"         config/kibana.yml
+[ -z "$SHARD_TIMEOUT" ]     || sed -ri "s|^(shard_timeout):.*|\1: ${SHARD_TIMEOUT}|"             config/kibana.yml
+[ -z "$VERIFY_SSL" ]        || sed -ri "s|^(verify_ssl):.*|\1: ${VERIFY_SSL}|"                   config/kibana.yml
+
+## run our arguments so we can use this as entrypoint
+[ $# -eq 0 ] || exec $*
diff --git a/kibana4/README.md b/kibana4/README.md
index b35638a..67cd54f 100644
--- a/kibana4/README.md
+++ b/kibana4/README.md
@@ -19,7 +19,7 @@ the linked `/etc/hosts` entry):
 
 ```
 docker run -d --name elasticsearch dockerfile/elasticsearch
-docker run -d --name kibana4 --link elasticsearch:elasticsearch -e ELASTICSEARCH=http://elasticsearch:9200 -p 5601:5601 rlister/kibana4
+docker run -d --name kibana4 --link elasticsearch:elasticsearch -e ELASTICSEARCH_URL=http://elasticsearch:9200 -p 5601:5601 rlister/kibana4
 ```
 
 You should now be able to use your dashboard at