openstack
/
kolla
Code Issues Proposed changes

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 a93f171da3)
This commit is contained in:
Marcin Juszkiewicz 2020-12-07 20:45:43 +01:00
parent 8a0094e337
commit 227831c58d
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/base/Dockerfile.j2
View File

@ -183,17 +183,10 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
{% if base_distro == 'centos' %} {% if base_distro == 'centos' %}
{% block base_centos_gpg_key_import %} {% block base_centos_gpg_key_import %}
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
{% endblock %} {% endblock %}
{% set base_centos_yum_repo_keys = [ {% 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 = [ {% set base_centos_yum_repo_packages = [
'centos-release-openstack-wallaby', 'centos-release-openstack-wallaby',
@ -214,6 +207,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
'centos-nfv-openvswitch', 'centos-nfv-openvswitch',
'centos-opstools', 'centos-opstools',
'centos-rabbitmq-38', 'centos-rabbitmq-38',
'epel',
'epel-modular',
] %} ] %}
{% if base_arch == 'x86_64' %} {% if base_arch == 'x86_64' %}
@ -271,7 +266,6 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
# Install base packages # Install base packages
{{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_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 #} {# endif for base_package_type rpm #}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}