diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2015-12-24 11:04:23 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2015-12-24 15:54:51 +0800 |
| commit | b39c8e2918bfb93b1d362ebeefc1778ed5459ea0 (patch) | |
| tree | d50384c6a89d48c90a6284e79be6251ac56a7c6c | |
| parent | d7095790a2f1a1c390785ecac058fe32cc1e90e2 (diff) | |
| download | kolla-b39c8e2918bfb93b1d362ebeefc1778ed5459ea0.tar.gz kolla-b39c8e2918bfb93b1d362ebeefc1778ed5459ea0.zip | |
import the gpg public key properly
include:
* CentOS 7 RPM GPG key
* Percona repo GPG key
* OpenStack Magnum repo GPG key
Closes-Bug: #1528988
Change-Id: I2419d1d130c2cc4466e884e4022b64d81109943b
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 22457700c..c83271b8c 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -48,8 +48,9 @@ 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 && \ - rpm --import https://raw.githubusercontent.com/ceph/ceph/master/keys/release.asc +RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB \ + && rpm --import https://raw.githubusercontent.com/ceph/ceph/master/keys/release.asc \ + && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona {% if install_metatype in ['rdo', 'mixed'] %} @@ -70,7 +71,8 @@ RUN yum-config-manager --enable rhel-7-server-rpms \ {% if base_distro == 'centos' %} -RUN yum install -y epel-release yum-plugin-priorities \ +RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \ + && yum install -y epel-release yum-plugin-priorities \ && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \ && yum clean all diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index c6307c3dd..ce2622c36 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -5,12 +5,14 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos'] %} RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo \ + && rpm --import https://copr-be.cloud.fedoraproject.org/results/sdake/openstack-magnum/pubkey.gpg \ && yum install -y openstack-magnum-common \ && yum clean all {% elif base_distro in ['fedora'] %} -RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/fedora-22/sdake-openstack-magnum-fedora-22.repo -o /etc/yum.repos.d/sdake-openstack-magnum-f22.repo | +RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/fedora-22/sdake-openstack-magnum-fedora-22.repo -o /etc/yum.repos.d/sdake-openstack-magnum-f22.repo \ + && rpm --import https://copr-be.cloud.fedoraproject.org/results/sdake/openstack-magnum/pubkey.gpg \ && yum install -y openstack-magnum-common \ && yum clean all |