From de58339a0e1704ae1ade4e032a73bb4708ecfaf1 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Fri, 7 Jun 2019 12:44:30 +0200 Subject: Fix issues with Percona in Zuul and clean up a little bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- docker/xtrabackup/Dockerfile.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docker/xtrabackup/Dockerfile.j2') 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'] %} -- cgit v1.2.3