diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-29 10:37:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-29 10:37:54 +0000 |
| commit | 912ccf0658e88f5f8cea69c93a4ff1a830149e44 (patch) | |
| tree | bdbfa569af3d71b6ff1d64f20aaf6bba5d87310a | |
| parent | e41e86c805167b9ab2f5c6217f8f8ad5cf773f52 (diff) | |
| parent | fe00a87ec8e6257ad1724b342b70811c03117b58 (diff) | |
| download | kolla-912ccf0658e88f5f8cea69c93a4ff1a830149e44.tar.gz kolla-912ccf0658e88f5f8cea69c93a4ff1a830149e44.zip | |
Merge "Remove /var/yum/cache from CentOS base image"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 16c0e1d5a..aed29bdaa 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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 #} diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 761bf0e83..d907a8dcd 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -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 %} |