Skip to content

Commit 4a114b5

Browse files
keukoyoctozepto
authored andcommitted
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 88d4895)
1 parent d46edaf commit 4a114b5

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

docker/monasca/monasca-grafana/Dockerfile.j2

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1111

1212
{% if base_package_type == 'rpm' %}
1313
{% set monasca_grafana_build_packages = [
14-
'golang',
15-
'git',
16-
'npm',
1714
'bzip2',
15+
'fontconfig',
1816
'gcc-c++',
17+
'git',
18+
'golang',
1919
'make',
20+
'npm',
21+
'rpm-build',
2022
'ruby',
21-
'ruby-devel',
22-
'fontconfig',
23-
'rpm-build'
23+
'ruby-devel'
2424
] %}
2525
{% elif base_package_type == 'deb' %}
2626
{% set monasca_grafana_build_packages = [
27-
'golang',
28-
'git',
29-
'npm',
3027
'bzip2',
28+
'fontconfig',
3129
'g++',
30+
'git',
31+
'golang',
32+
'libffi-dev',
3233
'make',
34+
'npm',
35+
'rpm',
3336
'ruby',
34-
'ruby-dev',
35-
'fontconfig',
36-
'rpm'
37+
'ruby-dev'
3738
] %}
3839
{% endif %}
3940

0 commit comments

Comments
 (0)