diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-23 22:02:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-23 22:02:24 +0000 |
| commit | abeb5eaf4144284c22b0da6f3161d0b6550c3bbc (patch) | |
| tree | a833fabe83ae5e098517bb87580d8b8b005f6540 /docker | |
| parent | dbe0fd8fb9e58575cb1b70988926818e74270a09 (diff) | |
| parent | dfdfe86e2e487561ba935214c3f990267f739e9d (diff) | |
| download | kolla-abeb5eaf4144284c22b0da6f3161d0b6550c3bbc.tar.gz kolla-abeb5eaf4144284c22b0da6f3161d0b6550c3bbc.zip | |
Merge "Fix build of monasca-grafana" into stable/train
Diffstat (limited to 'docker')
| -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 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 %} |