From a0712ceef3d6c20cdd79417dcff10525c527fb3d Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 27 Sep 2019 14:12:55 +0100 Subject: Fix monasca-grafana - pin rake to <13 Rake 13.0.0 (released today) depends on Ruby 2.2, but CentOS 7 only provides Ruby 2.0. This change pins rake in the monasca-grafana image to versions earlier than 13.0.0. Change-Id: Id9a76f459aff016fbc920370c0a3ec58e0397fcb Closes-Bug: #1845647 --- docker/monasca/monasca-grafana/Dockerfile.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index e2333006c..08f64a007 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -48,7 +48,9 @@ ARG monasca_grafana_version=grafana4_2 ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_grafana_version.tar.gz {% block monasca_grafana_install %} -RUN gem install rake fpm \ +# NOTE(mgoddard): Pinning rake because rake 13.0.0 depends on Ruby 2.2, and CentOS 7 only provides +# Ruby 2.0. +RUN gem install rake:"~>12" 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