From 227831c58d46da2096272695c09a14724d852a67 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 7 Dec 2020 20:45:43 +0100 Subject: [PATCH] centos: clean up repo enable/disable/keys - install all 'centos-release-*' packages we need - disable all repos in one place - do not import CentOS keys - they are trusted by default Change-Id: I97308c74406d2af0e39b77eddef2693554381ab6 (cherry picked from commit a93f171da3df0491e2bf3d5c1bf7a5a856a6e128) --- docker/base/Dockerfile.j2 | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index fb6c8a685d..a5e936f7c3 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -183,17 +183,10 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ {% if base_distro == 'centos' %} {% block base_centos_gpg_key_import %} -RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial {% endblock %} {% set base_centos_yum_repo_keys = [ - '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools', - '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage', ] %} -# FIXME(mgoddard): Not available for CentOS 8 yet. -# -# '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization', -# {% set base_centos_yum_repo_packages = [ 'centos-release-openstack-wallaby', @@ -214,6 +207,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial 'centos-nfv-openvswitch', 'centos-opstools', 'centos-rabbitmq-38', + 'epel', + 'epel-modular', ] %} {% if base_arch == 'x86_64' %} @@ -271,7 +266,6 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen # Install base packages {{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }} -{{ macros.disable_extra_repos(['epel', 'epel-modular']) }} {# endif for base_package_type rpm #} {% elif base_package_type == 'deb' %}