Skip to content

Commit

Permalink
Update to kibana to most recent snapshot (#2498)
Browse files Browse the repository at this point in the history
* Timelion is now part of master, not need to install it anymore
* Default host is now localhost, 0.0.0.0 for dev needs config file: elastic/kibana#8013
  • Loading branch information
ruflin authored and andrewkroh committed Sep 8, 2016
1 parent 1c25d27 commit 5486b64
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
6 changes: 1 addition & 5 deletions testing/environments/docker/kibana/Dockerfile-snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN arch="$(dpkg --print-architecture)" \
&& chmod +x /usr/local/bin/gosu

RUN set -x \
&& curl -fSL "https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha6-SNAPSHOT-linux-x86_64.tar.gz?20160811" -o kibana.tar.gz \
&& curl -fSL "https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-alpha6-SNAPSHOT-linux-x86_64.tar.gz?20160908" -o kibana.tar.gz \
&& mkdir -p /opt/kibana \
&& tar -xz --strip-components=1 -C /opt/kibana -f kibana.tar.gz \
&& chown -R kibana:kibana /opt/kibana \
Expand All @@ -26,10 +26,6 @@ ENV PATH /opt/kibana/bin:$PATH

COPY ./docker-entrypoint.sh /

#RUN gosu kibana kibana-plugin install timelion
# This is a temporary fix as currently no alpha6 snapshot for timelion exists
RUN gosu kibana kibana-plugin install https://download.elastic.co/kibana/timelion/timelion-5.0.0-beta1.zip

EXPOSE 5601
ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["kibana"]
Expand Down
1 change: 1 addition & 0 deletions testing/environments/docker/kibana/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ if [ "$1" = 'kibana' ]; then
if [ "$ELASTICSEARCH_URL" -o "$ELASTICSEARCH_PORT_9200_TCP" ]; then
: ${ELASTICSEARCH_URL:='http://elasticsearch:9200'}
sed -ri "s!^(\#\s*)?(elasticsearch\.url:).*!\2 '$ELASTICSEARCH_URL'!" /opt/kibana/config/kibana.yml
sed -ri "s!^(\#\s*)?(server\.host:).*!\2 '0.0.0.0'!" /opt/kibana/config/kibana.yml
else
echo >&2 'warning: missing ELASTICSEARCH_PORT_9200_TCP or ELASTICSEARCH_URL'
echo >&2 ' Did you forget to --link some-elasticsearch:elasticsearch'
Expand Down

0 comments on commit 5486b64

Please sign in to comment.