diff options
| author | Zuul <zuul@review.openstack.org> | 2018-05-30 16:16:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-05-30 16:16:38 +0000 |
| commit | 98a6804860c4d83b13d252ba34e60464431ad5e6 (patch) | |
| tree | b437423e6748c50af856994afe5b5473b4b5cd14 | |
| parent | e2765699c79621725926311ab064a1e15cd2eabc (diff) | |
| parent | 478805680dd7dad877e39fdb66f7fee41453224b (diff) | |
| download | kolla-98a6804860c4d83b13d252ba34e60464431ad5e6.tar.gz kolla-98a6804860c4d83b13d252ba34e60464431ad5e6.zip | |
Merge "Fix the elasticsearch start failed"
| -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 f9a8204b3..9c5c29670 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -10,10 +10,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set elasticsearch_packages = [ 'elasticsearch', - 'java-1.7.0-openjdk' + 'java-1.8.0-openjdk' ] %} -ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/ +ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ {% elif base_distro in ['debian', 'ubuntu'] %} {% set elasticsearch_packages = [ |