Merge "Unhardcode elasticsearch and kibana version"

This commit is contained in:
Jenkins 2016-09-15 12:42:28 +00:00 committed by Gerrit Code Review
commit ba90f98fbf
3 changed files with 4 additions and 2 deletions

View File

@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }}
ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd64/
RUN apt-get -y install --no-install-recommends openjdk-8-jre \
&& curl https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.3/elasticsearch-2.3.3.deb -o /tmp/elasticsearch.deb \
&& curl https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/{{ elasticsearch_version }}/elasticsearch-{{ elasticsearch_version }}.deb -o /tmp/elasticsearch.deb \
&& dpkg -i /tmp/elasticsearch.deb \
&& rm -f /tmp/elasticsearch.deb \
&& apt-get clean

View File

@ -1,7 +1,7 @@
FROM {{ namespace }}/base-tools:{{ tag }}
MAINTAINER {{ maintainer }}
RUN curl https://download.elastic.co/kibana/kibana/kibana_4.5.1_amd64.deb -o /tmp/kibana.deb \
RUN curl https://download.elastic.co/kibana/kibana/kibana-{{ kibana_version }}-amd64.deb -o /tmp/kibana.deb \
&& dpkg -i /tmp/kibana.deb \
&& rm -f /tmp/kibana.deb

View File

@ -22,3 +22,5 @@ configs:
versions:
influxdb_version: "0.13.0"
grafana_version: "3.0.3-1463994644"
elasticsearch_version: "2.4.0"
kibana_version: "4.6.1"