diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-30 13:46:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-30 13:46:24 +0000 |
| commit | ddad3fc6af469ef721c44a114daba8638e24fcce (patch) | |
| tree | 5b8b1a1cdb7d4f81e4b39b76837fd3396fe1b9cb /docker | |
| parent | f413c6b4115ab128ae2bbb807a1e8eb4ab830ede (diff) | |
| parent | 857ca7033f6572840df6a9d8a1650f2026bb31fd (diff) | |
| download | kolla-ddad3fc6af469ef721c44a114daba8638e24fcce.tar.gz kolla-ddad3fc6af469ef721c44a114daba8638e24fcce.zip | |
Merge "gnocchi: take care of centos/source on non-x86"
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 \ |