diff options
| author | Martin André <m.andre@redhat.com> | 2019-01-30 11:11:00 +0100 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2019-01-30 16:15:11 +0100 |
| commit | 79ad393823f2df7abacf3415a50ff1f9eaf36fc7 (patch) | |
| tree | 8ca4ceb13614142b55bae103a48dca02b2ba2f62 /docker/monasca | |
| parent | 1d6817e18146ff49486adf5432f4bfe0f1ea1920 (diff) | |
| download | kolla-79ad393823f2df7abacf3415a50ff1f9eaf36fc7.tar.gz kolla-79ad393823f2df7abacf3415a50ff1f9eaf36fc7.zip | |
Fix broken xtrabackup and monasca-grafana images
Percona started signing packages with a new public GPG key, without
providing it via HTTPS. Ship the PERCONA-PACKAGING-KEY extracted from
the percona-release package.
https://jira.percona.com/browse/PT-1685
monasca-grafana broken by 'rake' missing when trying to install the
'fpm' gem.
Co-Authored-By: Mark Goddard <mark@stackhpc.com>
Change-Id: Ica9867448dc20864f2fd4614a295a23a4a625af4
Closes-Bug: #1813906
Closes-Bug: #1813927
Diffstat (limited to 'docker/monasca')
| -rw-r--r-- | docker/monasca/monasca-grafana/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2 index 4a88bb0a2..a43d71dc0 100644 --- a/docker/monasca/monasca-grafana/Dockerfile.j2 +++ b/docker/monasca/monasca-grafana/Dockerfile.j2 @@ -48,7 +48,7 @@ ARG monasca_grafana_version=grafana4 ARG monasca_grafana_url=https://github.com/monasca/grafana/archive/$monasca_grafana_version.tar.gz {% block monasca_grafana_install %} -RUN gem install fpm \ +RUN gem install rake 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} \ |