diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-06-07 12:44:30 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-06-08 18:54:19 +0200 |
| commit | de58339a0e1704ae1ade4e032a73bb4708ecfaf1 (patch) | |
| tree | 663b80131895b7258222e16ab0dd463a89172e90 /docker/xtrabackup/Dockerfile.j2 | |
| parent | 5859180c2c78c62defca37446722b5f15fdbefb7 (diff) | |
| download | kolla-de58339a0e1704ae1ade4e032a73bb4708ecfaf1.tar.gz kolla-de58339a0e1704ae1ade4e032a73bb4708ecfaf1.zip | |
Fix issues with Percona in Zuul and clean up a little bit
Percona site has connectivity issues from OVH hosts (of Zuul).
This patch makes it so that:
- the internal repo is actually used
- RPM GPG keys are downloaded from the actually used repo
- Ubuntu mimics the RHEL behavior (i.e. the Percona repo is
enabled only in the xtrabackup image)
extra benefit: no need for APT preferences for Percona repo
to spare MariaDB deps
Change-Id: Id27831f6b404762f9e44fd6bd1c4702bf06b05f8
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Diffstat (limited to 'docker/xtrabackup/Dockerfile.j2')
| -rw-r--r-- | docker/xtrabackup/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/xtrabackup/Dockerfile.j2 b/docker/xtrabackup/Dockerfile.j2 index 9c11c4ccb..341a0d2f3 100644 --- a/docker/xtrabackup/Dockerfile.j2 +++ b/docker/xtrabackup/Dockerfile.j2 @@ -6,7 +6,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if base_package_type == 'rpm' %} -RUN yum-config-manager --enable percona\* +RUN yum-config-manager --enable percona-release-\* +{% endif %} + +{% if base_package_type == 'deb' %} +RUN sed -i -e '/percona/ s|^#deb |deb |' /etc/apt/sources.list {% endif %} {% if base_package_type in ['rpm', 'deb'] %} |