Fixes for newer kibana config

This commit is contained in:
Dave Pedu 2016-02-23 13:29:11 -08:00
parent 554260000e
commit 480f718604
2 changed files with 11 additions and 10 deletions

View File

@ -1,13 +1,14 @@
FROM ubuntu:trusty
RUN apt-get update ;\
apt-get install -y curl openjdk-7-jre-headless supervisor ;\
mkdir /opt/kibana ;\
curl -o /tmp/kibana4.tar.gz https://download.elastic.co/kibana/kibana/kibana-4.4.1-linux-x64.tar.gz ;\
tar -C /opt/kibana/ -zxvf /tmp/kibana4.tar.gz --strip-components=1 ;\
rm /tmp/kibana4.tar.gz ;\
useradd kibana ;\
rm -rf /var/lib/apt/lists/*
RUN apt-get update && \
apt-get install -y curl openjdk-7-jre-headless supervisor && \
mkdir /opt/kibana && \
curl -o /tmp/kibana4.tar.gz https://download.elastic.co/kibana/kibana/kibana-4.4.1-linux-x64.tar.gz && \
tar -C /opt/kibana/ -zxvf /tmp/kibana4.tar.gz --strip-components=1 && \
rm /tmp/kibana4.tar.gz && \
useradd kibana && \
rm -rf /var/lib/apt/lists/* && \
chown -R kibana:kibana /opt/kibana/optimize/
ADD start /start
ADD kibana.conf /etc/supervisor/conf.d/kibana.conf

4
start
View File

@ -4,11 +4,11 @@
trap 'kill $(jobs -p)' EXIT
if [ "$ELASTICSEARCH_HOSTNAME" != "" ]; then
sed -i -r "s/^elasticsearch_url: .+/elasticsearch_url: \"http:\/\/${ELASTICSEARCH_HOSTNAME}\/\"/" /opt/kibana/config/kibana.yml
sed -i -r "s/^(#\s+)?elasticsearch.url: .+/elasticsearch.url: \"http:\/\/${ELASTICSEARCH_HOSTNAME}\/\"/" /opt/kibana/config/kibana.yml
fi
if [ "$KIBANA_PORT" != "" ]; then
sed -i -r "s/^port: .+/port: $KIBANA_PORT/" /opt/kibana/config/kibana.yml
sed -i -r "s/^(#\s+)?server.port: .+/server.port: $KIBANA_PORT/" /opt/kibana/config/kibana.yml
fi
supervisord