diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-26 15:16:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-26 15:16:55 +0000 |
| commit | 5b4e00decc28512136cdeb27404b2febb62d8dc7 (patch) | |
| tree | 5040fabe991f5a5f3804c83ac36a161ac3a6399c /docker | |
| parent | 44323579b6d70e9797825adf5ab0931dbcbab608 (diff) | |
| parent | f9def021d86caecfd57018f41792f8a7c6bc6a80 (diff) | |
| download | kolla-5b4e00decc28512136cdeb27404b2febb62d8dc7.tar.gz kolla-5b4e00decc28512136cdeb27404b2febb62d8dc7.zip | |
Merge "Change lang package block order"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index fd2ced890..9a8645f18 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -59,19 +59,6 @@ COPY dnf.conf /etc/dnf/dnf.conf {% endblock %} {% endblock %} -# Install what is needed for en_US.UTF-8 -{% block base_centos_distro_sync_and_languages %} - -{% set base_centos_language_packages = [ - 'langpacks-en', - 'glibc-all-langpacks' -] %} - -RUN {{ macros.install_packages(base_centos_language_packages | customizable("centos_language_packages"), chain=True, clean=False) }} \ - && {{ macros.rpm_security_update(clean_package_cache) }} - -{% endblock %} - #### BEGIN REPO ENABLEMENT {% set base_yum_repo_files = [ ] %} @@ -155,6 +142,19 @@ RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \ {% block base_centos_repo_overrides_post_copy %}{% endblock %} +# Install what is needed for en_US.UTF-8 +{% block base_centos_distro_sync_and_languages %} + +{% set base_centos_language_packages = [ + 'langpacks-en', + 'glibc-all-langpacks' +] %} + +RUN {{ macros.install_packages(base_centos_language_packages | customizable("centos_language_packages"), chain=True, clean=False) }} \ + && {{ macros.rpm_security_update(clean_package_cache) }} + +{% endblock %} + {{ macros.install_packages(base_yum_url_packages | customizable("yum_url_packages")) }} {% for key in base_yum_repo_keys | customizable('yum_repo_keys') %} |