openstack/kolla
Code Issues Proposed changes

Merge "Fix the elasticsearch start failed"

Browse Source
This commit is contained in:
Zuul 2018-05-30 16:16:38 +00:00 committed by Gerrit Code Review
commit 98a6804860
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/elasticsearch/Dockerfile.j2
View File

@ -10,10 +10,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set elasticsearch_packages = [ {% set elasticsearch_packages = [
'elasticsearch', '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'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set elasticsearch_packages = [ {% set elasticsearch_packages = [