From 6d853dc04e7e11687a8a0f57d49b276f156cc2c7 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Tue, 17 Sep 2019 12:14:22 +0200 Subject: CI: CentOS - override mirrors ASAP + crmsh mirror override MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes mirrored repos used as soon as they are installed in the image, instead of hitting upstreams. This patch also adds crmsh override. Usable only after infra change merges. Depends-on: https://review.opendev.org/682576 Change-Id: Ic7494eff4c740b6e528da4508dc88a64e697bc04 Signed-off-by: Radosław Piliszek --- docker/base/Dockerfile.j2 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 395ebb043..c9e17a2ef 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -109,6 +109,8 @@ COPY yum.conf /etc/yum.conf COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }} {%- endfor %} +{% block base_centos_repo_overrides_post_copy %}{% endblock %} + {{ macros.install_packages(base_yum_url_packages | customizable("yum_url_packages")) }} {% for key in base_yum_repo_keys | customizable('yum_repo_keys') %} @@ -123,6 +125,8 @@ COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }} {{ cmd }} {% endfor %} +{% block base_centos_repo_overrides_post_rpm %}{% endblock %} + {% endif %} {# endif for repo setup for all RHEL except RHEL OSP #} @@ -166,7 +170,11 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen {% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%} && rpm --import {{ key }} \ {% endfor -%} - && {{ macros.rpm_security_update(clean_package_cache) }} + && /bin/true + +{% block base_centos_repo_overrides_post_yum %}{% endblock %} + +RUN {{ macros.rpm_security_update(clean_package_cache) }} {%- endif %} {# Endif for base_distro centos #} -- cgit v1.2.3