aboutsummaryrefslogtreecommitdiff
path: root/docker/elasticsearch
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-18 07:15:02 +0000
committerGerrit Code Review <review@openstack.org>2016-03-18 07:15:02 +0000
commitdb0de9b7af52251ead2ddacf2a7c283691a6d6b2 (patch)
tree725a10a6d3d7055c9321213455730c5d3d63eb47 /docker/elasticsearch
parentc61d9b5bc13146c733a82162074c009f01f89813 (diff)
parentec3baf0428d014310482146f5196d78ad670e72a (diff)
downloadkolla-db0de9b7af52251ead2ddacf2a7c283691a6d6b2.tar.gz
kolla-db0de9b7af52251ead2ddacf2a7c283691a6d6b2.zip
Merge "Install Elasticsearch and Kibana packages using yum/apt-get"
Diffstat (limited to 'docker/elasticsearch')
-rw-r--r--docker/elasticsearch/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2
index aa9f43c1b..c433db54b 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/docker/elasticsearch/Dockerfile.j2
@@ -8,7 +8,7 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/
RUN yum -y install \
java-1.7.0-openjdk \
- elasticsearch-2.1.1 \
+ elasticsearch \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
@@ -17,7 +17,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.7.0-openjdk-amd64/
RUN apt-get install -y --no-install-recommends \
openjdk-7-jre \
- elasticsearch=2.1.1 \
+ elasticsearch \
&& apt-get clean
{% endif %}