From ab679adcbfaa251b2de00daa0acdbb7771a8ae04 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 9 Jan 2019 16:42:17 +0100 Subject: 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 --- docker/monasca/monasca-thresh/Dockerfile.j2 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'docker/monasca') diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index 10170fb46..689799600 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -29,15 +29,7 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ 'maven', ] %} -{% 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 %} -- cgit v1.2.3