aboutsummaryrefslogtreecommitdiff
path: root/docker/elasticsearch
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-20 15:57:39 +0000
committerGerrit Code Review <review@openstack.org>2016-08-20 15:57:39 +0000
commit6667bcfc971758f70bfa669e3a100b09cc4b809b (patch)
treefca8ad78c43660fbca7c6a79a5e11bf5051f8d77 /docker/elasticsearch
parentd24004efec1b2fc76aac6bc33b8e5a1a5228f5cf (diff)
parent04d6736e89ec48a338e0499ead55b71b8d678db1 (diff)
downloadkolla-6667bcfc971758f70bfa669e3a100b09cc4b809b.tar.gz
kolla-6667bcfc971758f70bfa669e3a100b09cc4b809b.zip
Merge "Pin to Ubuntu 16.04"
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 2e04349bc..73b320889 100644
--- a/docker/elasticsearch/Dockerfile.j2
+++ b/docker/elasticsearch/Dockerfile.j2
@@ -13,11 +13,11 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set elasticsearch_packages = [
- 'openjdk-7-jre',
+ 'openjdk-8-jre',
'elasticsearch'
] %}
-ENV JAVA_HOME /usr/lib/jvm/java-1.7.0-openjdk-amd64/
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
{% endif %}