diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-12-07 20:45:43 +0100 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-05-17 12:57:52 +0000 |
| commit | a93f171da3df0491e2bf3d5c1bf7a5a856a6e128 (patch) | |
| tree | 80de4b6d2d14e71abd698d654f126820420a23f5 /docker/base/Dockerfile.j2 | |
| parent | 0506ede84f97159a8156ad51aea395d0868e6141 (diff) | |
| download | kolla-a93f171da3df0491e2bf3d5c1bf7a5a856a6e128.tar.gz kolla-a93f171da3df0491e2bf3d5c1bf7a5a856a6e128.zip | |
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
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 76feca670..f6411b95a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -158,17 +158,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-advanced-virtualization', @@ -197,6 +190,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' %} @@ -254,7 +249,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' %} |