diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-05-14 12:56:13 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-05-15 11:03:39 +0000 |
| commit | 35040899e4891563689c0b643f91067747000bba (patch) | |
| tree | 0854c4293b49fad7f8510ec942fcc4f0e9d75504 /docker | |
| parent | ec5daaaa634351d24706e605c2c6726be402d35b (diff) | |
| download | kolla-35040899e4891563689c0b643f91067747000bba.tar.gz kolla-35040899e4891563689c0b643f91067747000bba.zip | |
elasticsearch: enable for Debian
Change-Id: Ife92f910ccf76fdef48f81e09e0abde0d09b9a1a
Diffstat (limited to 'docker')
| -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 afc78c4aa..84dd95ad9 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -15,3 +15,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 %} |