openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
Michal Arbet 2020-12-20 16:18:05 +00:00 committed by Marcin Juszkiewicz
parent 13f96080db
commit 88d4895335
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
docker/monasca/monasca-grafana/Dockerfile.j2
View File

@ -11,29 +11,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set monasca_grafana_build_packages = [ {% set monasca_grafana_build_packages = [
'golang',
'git',
'npm',
'bzip2', 'bzip2',
'gcc-c++',
'make',
'ruby',
'ruby-devel',
'fontconfig', 'fontconfig',
'rpm-build' 'gcc-c++',
'git',
'golang',
'make',
'npm',
'rpm-build',
'ruby',
'ruby-devel'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set monasca_grafana_build_packages = [ {% set monasca_grafana_build_packages = [
'golang',
'git',
'npm',
'bzip2', 'bzip2',
'g++',
'make',
'ruby',
'ruby-dev',
'fontconfig', 'fontconfig',
'rpm' 'g++',
'git',
'golang',
'libffi-dev',
'make',
'npm',
'rpm',
'ruby',
'ruby-dev'
] %} ] %}
{% endif %} {% endif %}