Merge "Fix build of monasca-grafana" into stable/train

This commit is contained in:
Zuul 2020-12-23 22:02:24 +00:00 committed by Gerrit Code Review
commit abeb5eaf41
1 changed files with 17 additions and 16 deletions

View File

@ -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',
'gcc-c++',
'make',
'ruby',
'ruby-devel',
'fontconfig',
'rpm-build'
'gcc-c++',
'git',
'golang',
'make',
'npm',
'rpm-build',
'ruby',
'ruby-devel'
] %}
{% elif base_package_type == 'deb' %}
{% set monasca_grafana_build_packages = [
'golang',
'git',
'npm',
'bzip2',
'g++',
'make',
'ruby',
'ruby-dev',
'fontconfig',
'rpm'
'g++',
'git',
'golang',
'libffi-dev',
'make',
'npm',
'rpm',
'ruby',
'ruby-dev'
] %}
{% endif %}