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
(cherry picked from commit a0712ceef3
)
This commit is contained in:
parent
2761f3b62a
commit
b847daea68
|
@ -48,7 +48,9 @@ ARG monasca_grafana_version=grafana4
|
||||||
ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_grafana_version.tar.gz
|
ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_grafana_version.tar.gz
|
||||||
|
|
||||||
{% block monasca_grafana_install %}
|
{% 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} \
|
&& curl -sSL -o /tmp/monasca-grafana.tgz ${monasca_grafana_url} \
|
||||||
&& mkdir -p ${monasca_grafana_build_path} \
|
&& mkdir -p ${monasca_grafana_build_path} \
|
||||||
&& tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \
|
&& tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \
|
||||||
|
|
Loading…
Reference in New Issue