diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-01-09 16:42:17 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-02-19 11:24:45 +0000 |
| commit | ab679adcbfaa251b2de00daa0acdbb7771a8ae04 (patch) | |
| tree | cecdc3f1e12d0cc73a1d69a0a69ad807005a0fdc /docker/logstash | |
| parent | dc20a3a0b6001185362e99e30531f2712cc6af57 (diff) | |
| download | kolla-ab679adcbfaa251b2de00daa0acdbb7771a8ae04.tar.gz kolla-ab679adcbfaa251b2de00daa0acdbb7771a8ae04.zip | |
debian/ubuntu: introduce 'debian_arch' variable
Many images have 'if x86_64 then amd64 elif aarch64 then arm64' check to
comply with Debian like architecture names in several projects.
This patch creates 'debian_arch' variable which can be used in all
Docker files (similar to 'base_arch' one).
All required images got converted to use it.
Change-Id: I9c5e6f13d6c9b24fe323408512bd5aef290111ad
Diffstat (limited to 'docker/logstash')
| -rw-r--r-- | docker/logstash/Dockerfile.j2 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/docker/logstash/Dockerfile.j2 b/docker/logstash/Dockerfile.j2 index 61094da7c..36d62676e 100644 --- a/docker/logstash/Dockerfile.j2 +++ b/docker/logstash/Dockerfile.j2 @@ -20,15 +20,7 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ 'logrotate' ] %} -{% if base_arch == 'x86_64' %} -ARG java_arch=amd64 -{% elif base_arch == 'aarch64' %} -ARG java_arch=arm64 -{% else %} -ARG java_arch={{ base_arch }} -{% endif %} - -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-${java_arch}/ +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-{{debian_arch}}/ {% endif %} |