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/base/Dockerfile.j2 | |
| 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/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2af3ae874..79fc0fdff 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -56,6 +56,11 @@ COPY yum.conf /etc/yum.conf {% endblock %} #### BEGIN REPO ENABLEMENT + +# Workaround https://bugs.launchpad.net/kolla/+bug/1813906 +# https://jira.percona.com/browse/PT-1685 +COPY gpg-keys/PERCONA-PACKAGING-KEY /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY + {% set base_yum_repo_files = [ ] %} @@ -84,6 +89,7 @@ COPY yum.conf /etc/yum.conf 'https://repos.influxdata.com/influxdb.key', 'https://packagecloud.io/gpg.key', 'https://www.percona.com/downloads/RPM-GPG-KEY-percona', + '/etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY', 'https://packages.treasuredata.com/GPG-KEY-td-agent' ] %} {% endif %} |