diff options
| author | Zuul <zuul@review.openstack.org> | 2018-05-15 17:26:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-05-15 17:26:10 +0000 |
| commit | 0c25f7c7ec7114c57f13ac856228eccd2fc687c0 (patch) | |
| tree | 9d77fcca4efa96f1bb8a42bd034884614d24fb1a | |
| parent | febcbcc6916d3dcfeebf66e83f4a57952cee1050 (diff) | |
| parent | 35040899e4891563689c0b643f91067747000bba (diff) | |
| download | kolla-0c25f7c7ec7114c57f13ac856228eccd2fc687c0.tar.gz kolla-0c25f7c7ec7114c57f13ac856228eccd2fc687c0.zip | |
Merge "elasticsearch: enable for Debian"
| -rw-r--r-- | docker/base/sources.list.debian | 3 | ||||
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 2d048eacc..b663bc00d 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -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 diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index 22e2d379e..f9a8204b3 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -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 %} |