diff options
| -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 04aeee35a..2f47943ae 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -187,11 +187,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 3dc7035ca..e69eab450 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -52,16 +52,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 %} |