Browse Source

Merge "gnocchi-base: numpy provides aarch64 binary wheels" into stable/wallaby

changes/80/791780/1
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
8a0094e337
  1. 20
      docker/gnocchi/gnocchi-base/Dockerfile.j2

20
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 %}

Loading…
Cancel
Save