openstack
/
kolla
Code Issues Proposed changes

Merge "Remove /var/yum/cache from CentOS base image"

This commit is contained in:
Zuul 2019-10-29 10:37:54 +00:00 committed by Gerrit Code Review
parent e41e86c805 fe00a87ec8
commit 912ccf0658
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/base/Dockerfile.j2
View File

@ -189,11 +189,8 @@ 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 -%}
&& /bin/true
{% block base_centos_repo_overrides_post_yum %}{% endblock %}
RUN {{ macros.rpm_security_update(clean_package_cache) }}
{% block base_centos_repo_overrides_post_yum -%}{% endblock -%}
&& {{ macros.rpm_security_update(clean_package_cache) }}
{%- endif %}
{# Endif for base_distro centos #}

6
tests/templates/template_overrides.j2
View File

@ -48,16 +48,14 @@ RUN sed -i \
{% block base_centos_repo_overrides_post_yum %}
{% endraw %}
RUN sed -i \
&& sed -i \
-e "/^mirrorlist/ d" \
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
/etc/yum.repos.d/CentOS-*.repo \
&& sed -i \
-e "/^metalink/ d" \
-e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|" \
/etc/yum.repos.d/epel*.repo
/etc/yum.repos.d/epel*.repo \
{% raw %}
{% endblock %}