diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-18 09:31:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-18 09:31:00 +0000 |
| commit | 96ce475bf875cebca947fe127f0230c0186cc560 (patch) | |
| tree | 6eb60e64a5ccbcaaedd341c5a1384622de766f8e /docker | |
| parent | d5f081a879b46427ad3d7720bd43767f0c3e7ae5 (diff) | |
| parent | 6d853dc04e7e11687a8a0f57d49b276f156cc2c7 (diff) | |
| download | kolla-96ce475bf875cebca947fe127f0230c0186cc560.tar.gz kolla-96ce475bf875cebca947fe127f0230c0186cc560.zip | |
Merge "CI: CentOS - override mirrors ASAP + crmsh mirror override"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 10 |
1 files changed, 9 insertions, 1 deletions
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 #} |