From a729d132d6a8a891dc0ab92c9bda094a59cea231 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 26 Dec 2017 16:18:14 +0800 Subject: Consume RDO packaged mariadb version RDO packaged mariadb recieves far more testing and qualification than any other mariadb package on CentOS. Lets use that instead of a hard-pinned old version of mariadb from mariadb.org. This patch also upgrade MariaDB from 10.0 to 10.1.20 for RHEL/CentOS/Oracle Linux. Depends-On: I8374ac2219ad7880970cd789727d01af7cac1077 Depends-On: Ia2acb09e877a586243fc1acb49d8d140cf27d7b5 Co-Authored-By: Xinliang Liu Change-Id: I071362fc1b8d60199a77e2fe0475d2b4c3b5341b --- docker/base/Dockerfile.j2 | 7 ------- docker/base/MariaDB.repo | 5 ----- 2 files changed, 12 deletions(-) delete mode 100644 docker/base/MariaDB.repo (limited to 'docker/base') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2b4b67641..a3678f589 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -65,7 +65,6 @@ COPY yum.conf /etc/yum.conf 'grafana.repo', 'influxdb.repo', 'kibana.yum.repo', - 'MariaDB.repo', 'nfs_ganesha.repo', 'opendaylight.repo', 'sensu.repo', @@ -73,13 +72,7 @@ COPY yum.conf /etc/yum.conf 'zookeeper.repo' ] %} - {% set base_yum_url_packages = [ - 'http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-4.noarch.rpm' - ] %} - {% set base_yum_repo_keys = [ - 'http://yum.mariadb.org/RPM-GPG-KEY-MariaDB', - '/etc/pki/rpm-gpg/RPM-GPG-KEY-Percona', 'https://packages.elastic.co/GPG-KEY-elasticsearch', 'https://repos.influxdata.com/influxdb.key', 'https://packagecloud.io/gpg.key', diff --git a/docker/base/MariaDB.repo b/docker/base/MariaDB.repo deleted file mode 100644 index ddbb1a21d..000000000 --- a/docker/base/MariaDB.repo +++ /dev/null @@ -1,5 +0,0 @@ -[mariadb] -name = MariaDB -baseurl = https://yum.mariadb.org/10.0/centos7-amd64 -gpgkey = https://yum.mariadb.org/RPM-GPG-KEY-MariaDB -gpgcheck = 1 -- cgit v1.2.3