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 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker/monasca') 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} \ -- cgit v1.2.3