diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-21 16:06:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-21 16:06:21 +0000 |
| commit | 9c882b0b43965cfc823658887d63d6374ad95ae5 (patch) | |
| tree | 85f7ab3dcc33b79c3522804635ca01fa94884102 | |
| parent | bd6ef1f57f1b0e404656cf931a687f15185514a1 (diff) | |
| parent | 88d48953357c67de14ff83f0361825b05fc71a07 (diff) | |
| download | kolla-9c882b0b43965cfc823658887d63d6374ad95ae5.tar.gz kolla-9c882b0b43965cfc823658887d63d6374ad95ae5.zip | |
Merge "Fix build of monasca-grafana"
| -rw-r--r-- | docker/monasca/monasca-grafana/Dockerfile.j2 | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index f752802db..9e4c49492 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', + '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 %} |