openstack
/
kolla
Code Issues Proposed changes

Merge "elasticsearch: enable for Debian"

This commit is contained in:
Zuul 2018-05-15 17:26:10 +00:00 committed by Gerrit Code Review
parent febcbcc691 35040899e4
commit 0c25f7c7ec
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/base/sources.list.debian
View File

@ -12,3 +12,6 @@ deb [arch=amd64] https://packagecloud.io/grafana/stable/debian/ stretch main
# Unofficial repository for grafana (LP: #1768585).
deb [arch=arm64] https://dl.bintray.com/fg2it/deb-arm64/ stretch main
# elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64)
deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main

10
docker/elasticsearch/Dockerfile.j2
View File

@ -21,7 +21,15 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/
'openjdk-8-jre'
] %}
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
{% if base_arch == 'x86_64' %}
ENV java_arch=amd64
{% elif base_arch == 'aarch64' %}
ENV java_arch=arm64
{% else %}
ENV java_arch={{ base_arch }}
{% endif %}
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-{{ java_arch }}/
{% endif %}