diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-10 18:51:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-10 18:51:12 +0000 |
| commit | 1cfd04ccc30d1b95cf07000d03edbbda1ed0ab16 (patch) | |
| tree | 92ce447083d2d590028d481078c7fc975ab5f56e /docker | |
| parent | 34253adcb90e4812a5774cd5af388cc89c0265c6 (diff) | |
| parent | 9bad71d7c3fe3cdd1b128925554c4fdec1420a7f (diff) | |
| download | kolla-1cfd04ccc30d1b95cf07000d03edbbda1ed0ab16.tar.gz kolla-1cfd04ccc30d1b95cf07000d03edbbda1ed0ab16.zip | |
Merge "gnocchi-base: numpy provides aarch64 binary wheels"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 6e921d39d..d95d41bd2 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 %} |