From 88d48953357c67de14ff83f0361825b05fc71a07 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Sun, 20 Dec 2020 16:18:05 +0000 Subject: [PATCH] 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 --- docker/monasca/monasca-grafana/Dockerfile.j2 | 33 ++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index f752802dbc..9e4c49492b 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -11,29 +11,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 %}