diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-09-27 14:12:55 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-09-27 13:32:46 +0000 |
| commit | a0712ceef3d6c20cdd79417dcff10525c527fb3d (patch) | |
| tree | 42e8a7beb4b411f811fdbf7b4643b5fa2dd98d88 /docker/monasca | |
| parent | f9b229841db5d27fe11b95d055d74af289893ef2 (diff) | |
| download | kolla-a0712ceef3d6c20cdd79417dcff10525c527fb3d.tar.gz kolla-a0712ceef3d6c20cdd79417dcff10525c527fb3d.zip | |
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
Diffstat (limited to 'docker/monasca')
| -rw-r--r-- | docker/monasca/monasca-grafana/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
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} \ |