diff options
| author | Michal Arbet <michal.arbet@ultimum.io> | 2020-12-20 16:18:05 +0000 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-12-21 16:43:39 +0000 |
| commit | dfdfe86e2e487561ba935214c3f990267f739e9d (patch) | |
| tree | 5af864f58de55ec4d629da7e11032f3925a70c65 | |
| parent | 10e4503e7d2363a97068a74dbdf9d4ac4ec805f1 (diff) | |
| download | kolla-dfdfe86e2e487561ba935214c3f990267f739e9d.tar.gz kolla-dfdfe86e2e487561ba935214c3f990267f739e9d.zip | |
Fix build of monasca-grafana
This patch is adding libffi-dev to build_packages
for Debian/Ubuntu which is fixing monasca-grafana build.
Change-Id: I67f93687d70f1c8c92719857cbf74971d9a17ae6
(cherry picked from commit 88d48953357c67de14ff83f0361825b05fc71a07)
| -rw-r--r-- | docker/monasca/monasca-grafana/Dockerfile.j2 | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index 9e2d46adf..2e003da75 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -9,29 +9,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set monasca_grafana_build_packages = [ - 'golang', - 'git', - 'npm', 'bzip2', + 'fontconfig', 'gcc-c++', + 'git', + 'golang', 'make', + 'npm', + 'rpm-build', 'ruby', - 'ruby-devel', - 'fontconfig', - 'rpm-build' + 'ruby-devel' ] %} {% elif base_package_type == 'deb' %} {% set monasca_grafana_build_packages = [ - 'golang', - 'git', - 'npm', 'bzip2', + 'fontconfig', 'g++', + 'git', + 'golang', + 'libffi-dev', 'make', + 'npm', + 'rpm', 'ruby', - 'ruby-dev', - 'fontconfig', - 'rpm' + 'ruby-dev' ] %} {% endif %} |