From 80dfcd0694efc6e08648adde6aac5fab8d920959 Mon Sep 17 00:00:00 2001 From: Allen Gao Date: Wed, 20 Jan 2016 17:04:05 +0800 Subject: [PATCH] use http instead of https for getting mariadb key yum.mariadb.org intermittent ssl certificate ca bundle has problem for now. https://mariadb.atlassian.net/browse/MDEV-9435 Change-Id: Ic0dd72c4586958224c03572ca9de0ea15a7a38fd Closes-Bug: #1536066 --- docker/base/Dockerfile.j2 | 2 +- docker/base/mariadb.yum.repo | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index f1be05b36a..19d2455289 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -48,7 +48,7 @@ COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo RUN yum -y install http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-3.noarch.rpm -RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB \ +RUN rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB \ && rpm --import https://download.ceph.com/keys/release.asc \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona diff --git a/docker/base/mariadb.yum.repo b/docker/base/mariadb.yum.repo index 564ce3f0e7..bee1d7a634 100644 --- a/docker/base/mariadb.yum.repo +++ b/docker/base/mariadb.yum.repo @@ -1,5 +1,5 @@ [mariadb] name = MariaDB baseurl = http://yum.mariadb.org/10.0/centos7-amd64 -gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB -gpgcheck=1 +gpgkey = http://yum.mariadb.org/RPM-GPG-KEY-MariaDB +gpgcheck = 1