diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-06-14 21:50:04 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-08-20 22:30:28 +0800 |
| commit | 04d6736e89ec48a338e0499ead55b71b8d678db1 (patch) | |
| tree | fe1167269efa50711f74f7c7c1d10d9e2c9d4494 /docker/elasticsearch | |
| parent | 2e0c5ecbf8ea1dfa6749e5515a38ecfa58764312 (diff) | |
| download | kolla-04d6736e89ec48a338e0499ead55b71b8d678db1.tar.gz kolla-04d6736e89ec48a338e0499ead55b71b8d678db1.zip | |
Pin to Ubuntu 16.04
Upgrade Ubuntu base image to Xenial
Closes-Bug: #1593599
Change-Id: I5832a729a9a4fa73c02442047c92ba088ce20db3
Diffstat (limited to 'docker/elasticsearch')
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 4 |
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 %} |