From 858c2748692d0b0c8fed9613a0c0a2514136190d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 8 May 2021 11:03:57 +0200 Subject: [PATCH] gnocchi-base: numpy provides aarch64 binary wheels There is no need to install libraries to build Numpy as we have binary wheel provided by numpy upstream. Change-Id: I721001f877f6ec2f9a2e425c088a2e22177d2e5b (cherry picked from commit 9bad71d7c3fe3cdd1b128925554c4fdec1420a7f) --- docker/gnocchi/gnocchi-base/Dockerfile.j2 | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 6e921d39d3..d95d41bd2d 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -51,16 +51,6 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages 'librados2-devel', ] %} - # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le - # it needs to be built - - {% if base_arch != 'x86_64' %} - {% set gnocchi_base_packages = gnocchi_base_packages + [ - 'blas-devel', - 'lapack-devel' - ] %} - {% endif %} - {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/gnocchi {% elif base_package_type == 'deb' %} @@ -69,16 +59,6 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi 'librados-dev', ] %} - # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le - # it needs to be built - - {% if base_arch != 'x86_64' %} - {% set gnocchi_base_packages = gnocchi_base_packages + [ - 'libblas-dev', - 'liblapack-dev' - ] %} - {% endif %} - {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} {% endif %}