diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-16 08:33:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-16 08:33:57 +0000 |
| commit | e30fb745542b64ff4656a9a5440702427b44c3f7 (patch) | |
| tree | 4b8f73fcfd82dc26dd73cbbd6be67ca747760102 /docker | |
| parent | 7479df9d71a2bd9b827229690ddce6bf0f2e4657 (diff) | |
| parent | 551c0fa2ced1f76cd775a9b51d5c50978c4ef78c (diff) | |
| download | kolla-e30fb745542b64ff4656a9a5440702427b44c3f7.tar.gz kolla-e30fb745542b64ff4656a9a5440702427b44c3f7.zip | |
Merge "import the rpm gpg key"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 4d1270b9e..9c921373f 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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 |