diff options
| author | Allen Gao <wanlong.gao@easystack.cn> | 2016-01-20 17:04:05 +0800 |
|---|---|---|
| committer | Allen Gao <wanlong.gao@easystack.cn> | 2016-01-20 17:10:47 +0800 |
| commit | 80dfcd0694efc6e08648adde6aac5fab8d920959 (patch) | |
| tree | 8c5579233a24f0bfe8c0a9a849b6e33cc4895d4f /docker/base | |
| parent | 7609cc242899d6bc0151f2e19392a9fa3555e29c (diff) | |
| download | kolla-80dfcd0694efc6e08648adde6aac5fab8d920959.tar.gz kolla-80dfcd0694efc6e08648adde6aac5fab8d920959.zip | |
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
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | 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 f1be05b36..19d245528 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 564ce3f0e..bee1d7a63 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 |