diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-05-26 12:12:35 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-05-26 12:12:35 +0200 |
| commit | 857ca7033f6572840df6a9d8a1650f2026bb31fd (patch) | |
| tree | 50fd1b154cd8d4b4cdc92c2c38d93966ee2d58c0 /docker | |
| parent | 331632f879ae9562df84ba499050e1e042196368 (diff) | |
| download | kolla-857ca7033f6572840df6a9d8a1650f2026bb31fd.tar.gz kolla-857ca7033f6572840df6a9d8a1650f2026bb31fd.zip | |
gnocchi: take care of centos/source on non-x86
As for Debian we need to install blas/lapack devel headers to build
scipy.
Change-Id: I2e0257072192bae6b689d549df12a05196ff7698
Partially-Implements: blueprint multiarch-and-arm64-containers
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 7bbafd6c4..c96e36704 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -46,6 +46,17 @@ RUN truncate -s 0 /etc/apache2/ports.conf 'python-ldappool', 'python-rados' ] %} + + # 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 \ && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ |
