openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
Jeffrey Zhang 2015-12-24 11:04:23 +08:00
parent d7095790a2
commit b39c8e2918
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/base/Dockerfile.j2
View File

@ -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

4
docker/magnum/magnum-base/Dockerfile.j2
View File

@ -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