diff options
| author | Zuul <zuul@review.openstack.org> | 2019-02-21 11:02:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-02-21 11:02:31 +0000 |
| commit | efc32ec0f44ab946766ab83b602d4cad4b420236 (patch) | |
| tree | 4e85e7b32d92cb903f5799ecc3a573c8be6783f0 /docker/monasca | |
| parent | a445d5085c32bb230df0ba5f1b1b08cb80906cbf (diff) | |
| parent | ab679adcbfaa251b2de00daa0acdbb7771a8ae04 (diff) | |
| download | kolla-efc32ec0f44ab946766ab83b602d4cad4b420236.tar.gz kolla-efc32ec0f44ab946766ab83b602d4cad4b420236.zip | |
Merge "debian/ubuntu: introduce 'debian_arch' variable"
Diffstat (limited to 'docker/monasca')
| -rw-r--r-- | docker/monasca/monasca-thresh/Dockerfile.j2 | 10 |
1 files changed, 1 insertions, 9 deletions
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 %} |