aboutsummaryrefslogtreecommitdiff
path: root/docker/magnum
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2015-12-24 11:04:23 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2015-12-24 15:54:51 +0800
commitb39c8e2918bfb93b1d362ebeefc1778ed5459ea0 (patch)
treed50384c6a89d48c90a6284e79be6251ac56a7c6c /docker/magnum
parentd7095790a2f1a1c390785ecac058fe32cc1e90e2 (diff)
downloadkolla-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
Diffstat (limited to 'docker/magnum')
-rw-r--r--docker/magnum/magnum-base/Dockerfile.j24
1 files changed, 3 insertions, 1 deletions
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