diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-06-04 12:05:12 +0100 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-06-09 08:33:58 +0000 |
| commit | fca4a088a49bbd8ee7ed6ce8b0b128df7b62399f (patch) | |
| tree | e29a8ec6225f55560d4ce3089c47201a09b2fa77 /docker | |
| parent | 4b77682911616a6cfac96df3695f0d7896f89b50 (diff) | |
| download | kolla-fca4a088a49bbd8ee7ed6ce8b0b128df7b62399f.tar.gz kolla-fca4a088a49bbd8ee7ed6ce8b0b128df7b62399f.zip | |
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 3784d32d9ceacf0dad8057092752f1ae7be37ed3)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/monasca/monasca-grafana/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/sensu/sensu-client/Dockerfile.j2 | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index 295f37ae2..2309aff2a 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -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. # 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. -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} \ && mkdir -p ${monasca_grafana_build_path} \ && tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \ diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2 index 9ccd4f3ae..90f6bff45 100644 --- a/docker/sensu/sensu-client/Dockerfile.j2 +++ b/docker/sensu/sensu-client/Dockerfile.j2 @@ -9,13 +9,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set sensu_client_packages = [ 'ceph-common', 'cyrus-sasl-devel', - 'docker-client', 'gcc-c++', 'make', 'mariadb', 'ntp', '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') %} {% set sensu_client_packages = sensu_client_packages + [ |