From dfdfe86e2e487561ba935214c3f990267f739e9d Mon Sep 17 00:00:00 2001
From: Michal Arbet <michal.arbet@ultimum.io>
Date: Sun, 20 Dec 2020 16:18:05 +0000
Subject: 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)
---
 docker/monasca/monasca-grafana/Dockerfile.j2 | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'docker/monasca')

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 %}
 
-- 
cgit v1.2.3