openstack/kolla-ansible
Code Issues Proposed changes

Merge "import the rpm gpg key"

Browse Source
This commit is contained in:
Jenkins 2015-12-16 08:33:57 +00:00 committed by Gerrit Code Review
commit e30fb74554
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/base/Dockerfile.j2
View File

@ -46,6 +46,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
{% if install_metatype in ['rdo', 'mixed'] %}
# These repos provide latest packages built from trunk master into RPMs
@ -66,6 +69,7 @@ RUN yum-config-manager --enable rhel-7-server-rpms \
{% if base_distro == 'centos' %}
RUN yum install -y epel-release yum-plugin-priorities \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& yum clean all
{% endif %}
@ -77,6 +81,7 @@ RUN yum install -y epel-release yum-plugin-priorities \
# Turn on EPEL throughout the build
RUN yum install -y \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& yum -y install yum-plugin-priorities \
&& yum clean all \
&& yum-config-manager --enable rhel-7-server-optional-rpms \
@ -90,6 +95,7 @@ RUN yum install -y \
RUN yum install -y \
yum-utils \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& yum clean all
RUN yum-config-manager --enable ol7_optional_latest ol7_addons
RUN yum install -y yum-plugin-priorities