From 7ae5f1fe629554e588cd3992666af139e1efd9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Mon, 10 Jun 2019 14:16:14 +0200 Subject: [PATCH] Add a variable to configure repos disabled in base CentOS image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [1] disabled CentOS Ceph Nautilus repo for Stein. It turned out to be a problem for TripleO ([2]) which does not use upstream Ceph repo and actually relies on CentOS Ceph Nautilus repo. We did not leave the option to override our customization. This patch adds a customizable variable to base CentOS image: centos_yum_repos_to_disable [1] https://review.opendev.org/651601 [2] https://review.opendev.org/664244 Change-Id: I867ca75cafe853b206beae2f81dfb79b62d05557 Signed-off-by: Radosław Piliszek --- docker/base/Dockerfile.j2 | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index fda528330e..1bc9296809 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -149,13 +149,18 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 'yum-plugin-priorities' ] %} -{{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages")) }} -{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') %} - {%- if loop.first %}RUN {% else %} && {% endif -%} - rpm --import {{ key }} \ +{% set base_centos_yum_repos_to_disable = [ +] %} + +RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \ +{% for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') -%} + && yum-config-manager --disable {{ repo }} \ {% endfor -%} -{%- if base_centos_yum_repo_keys|customizable('centos_yum_repo_keys')|length == 0 %}RUN {% else %} && {% endif -%} - {{ macros.rpm_security_update(clean_package_cache) }} +{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%} + && rpm --import {{ key }} \ +{% endfor -%} + && {{ macros.rpm_security_update(clean_package_cache) }} + {%- endif %} {# Endif for base_distro centos #}