Fix multiple issues
Both issues affect Train and earlier releases.
1. Fix monasca-grafana by pinning more Ruby gems
childprocess 3.0.0 and ffi 1.13.0 depend on Ruby 2.3.
2. Bump bifrost to 6.0.4
Bifrost had a fix to stop using the master branch of DIB which dropped
support for Python 2.
3. Drop docker-client from OracleLinux sensu-client image
The package fails to install due to a missing dependency on
subscription-manager.
Change-Id: Ida7e20833360bbca69c6aafc4f5d7cb375bb106f
Closes-Bug: #1882070
(cherry picked from commit 3784d32d9c
)
This commit is contained in:
parent
4b77682911
commit
fca4a088a4
|
@ -53,7 +53,8 @@ ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_graf
|
||||||
# NOTE(yoctozepto): Update npm to 6.x version to avoid issues with metadata parsing.
|
# NOTE(yoctozepto): Update npm to 6.x version to avoid issues with metadata parsing.
|
||||||
# NPM installs itself in /usr/local/bin (the default in Ubuntu) which is not in the PATH.
|
# NPM installs itself in /usr/local/bin (the default in Ubuntu) which is not in the PATH.
|
||||||
# This is forced for all distros to avoid conflicts with native packages.
|
# This is forced for all distros to avoid conflicts with native packages.
|
||||||
RUN gem install rake:"~>12" fpm \
|
# NOTE(mgoddard): childprocess 3.0.0 and ffi 1.13.0 depend on Ruby 2.3.
|
||||||
|
RUN gem install rake:"~>12" ffi:"<1.13.0" childprocess:"<2.0.0" fpm \
|
||||||
&& curl -sSL -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \
|
&& curl -sSL -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \
|
||||||
&& mkdir -p ${monasca_grafana_build_path} \
|
&& mkdir -p ${monasca_grafana_build_path} \
|
||||||
&& tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \
|
&& tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \
|
||||||
|
|
|
@ -9,13 +9,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% set sensu_client_packages = [
|
{% set sensu_client_packages = [
|
||||||
'ceph-common',
|
'ceph-common',
|
||||||
'cyrus-sasl-devel',
|
'cyrus-sasl-devel',
|
||||||
'docker-client',
|
|
||||||
'gcc-c++',
|
'gcc-c++',
|
||||||
'make',
|
'make',
|
||||||
'mariadb',
|
'mariadb',
|
||||||
'ntp',
|
'ntp',
|
||||||
'ruby-devel'
|
'ruby-devel'
|
||||||
] %}
|
] %}
|
||||||
|
{% if base_distro != 'oraclelinux' %}
|
||||||
|
# NOTE(mgoddard): Installing docker-client fails on OracleLinux.
|
||||||
|
{% set sensu_client_packages = sensu_client_packages + [
|
||||||
|
'docker-client',
|
||||||
|
] %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if distro_python_version.startswith('3') %}
|
{% if distro_python_version.startswith('3') %}
|
||||||
{% set sensu_client_packages = sensu_client_packages + [
|
{% set sensu_client_packages = sensu_client_packages + [
|
||||||
|
|
|
@ -315,7 +315,7 @@ SOURCES = {
|
||||||
'bifrost-base': {
|
'bifrost-base': {
|
||||||
'type': 'url',
|
'type': 'url',
|
||||||
'location': ('$tarballs_base/bifrost/'
|
'location': ('$tarballs_base/bifrost/'
|
||||||
'bifrost-6.0.3.tar.gz')},
|
'bifrost-6.0.4.tar.gz')},
|
||||||
'blazar-base': {
|
'blazar-base': {
|
||||||
'type': 'url',
|
'type': 'url',
|
||||||
'location': ('$tarballs_base/blazar/'
|
'location': ('$tarballs_base/blazar/'
|
||||||
|
|
Loading…
Reference in New Issue