diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-20 17:31:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-20 17:31:11 +0000 |
| commit | 10cfc7ba3a366381bbabdb2966577d4f9ff32dd6 (patch) | |
| tree | cb513e3bcef0cf17f8b61a0af1827db90cb813a8 | |
| parent | 08f907a2cc67d61ae354c6ba8de1905c4f1b96c8 (diff) | |
| parent | 80dfcd0694efc6e08648adde6aac5fab8d920959 (diff) | |
| download | kolla-10cfc7ba3a366381bbabdb2966577d4f9ff32dd6.tar.gz kolla-10cfc7ba3a366381bbabdb2966577d4f9ff32dd6.zip | |
Merge "use http instead of https for getting mariadb key"
| -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 |