From 36126c08255fcf8a201167b5d63f23f6bfdeceec Mon Sep 17 00:00:00 2001 From: Michał Nasiadka Date: Thu, 14 Jan 2021 09:49:07 +0100 Subject: CI: Use Docker proxy for pulls + Ruby fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For Train (due to CentOS 7) includes as well: - sensu-client: Pin simpleidn Ruby gem simpleidn Ruby gem started requiring Ruby 2.2. - monasca-grafana: Pin git Ruby gem fpm Ruby gem started requiring git Ruby gem git Ruby gem started requiring Ruby 2.3 Change-Id: I0c4d5e1ea16c6677813a334b38b3a22ad811531d Co-Authored-By: Radosław Piliszek Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/772077 (cherry picked from commit a8c12def858b57349207cab5fa8dabb3c23bdfa0) --- docker/monasca/monasca-grafana/Dockerfile.j2 | 3 ++- docker/sensu/sensu-client/Dockerfile.j2 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index 2e003da75..11974e0b3 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -55,7 +55,8 @@ ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_graf # 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. # 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 \ +# NOTE(yoctozepto): pinning git because fpm started requiring git and git started requiring Ruby 2.3 +RUN gem install rake:"~>12" ffi:"<1.13.0" childprocess:"<2.0.0" git:"~>1.7.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 f637ee704..7e9580432 100644 --- a/docker/sensu/sensu-client/Dockerfile.j2 +++ b/docker/sensu/sensu-client/Dockerfile.j2 @@ -88,7 +88,8 @@ RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \ # http://cbs.centos.org/koji/search?match=glob&type=package&terms=*sensu* # NOTE(hrw): whois 5.0.0 requires Ruby 2.4+ while CentOS has 2.0 # NOTE(yoctozepto): pinning minitest for the same reason -RUN {%if base_package_type == 'rpm' %} gem install whois:"<5" minitest:"~>5.11.3" && {% endif %} sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }} +# NOTE(yoctozepto): pinning simpleidn because it started requiring Ruby 2.2 +RUN {%if base_package_type == 'rpm' %} gem install whois:"<5" minitest:"~>5.11.3" simpleidn:"~>0.1.1" && {% endif %} sensu-install --plugins {{ sensu_plugins | customizable('plugins') | join (',') }} {% endblock %} {% block sensu_client_footer %}{% endblock %} -- cgit v1.2.3