diff options
| author | Gaël THEROND <gael.therond@bitswalk.com> | 2020-06-12 16:22:22 +0200 |
|---|---|---|
| committer | Gaël THEROND <gael.therond@bitswalk.com> | 2020-06-12 15:42:38 +0000 |
| commit | f9def021d86caecfd57018f41792f8a7c6bc6a80 (patch) | |
| tree | d70669085aaab0af9336960bb825ce70ecc686a4 /docker | |
| parent | ed91acfe5ff23b34e01b28fede0d5601fbff9628 (diff) | |
| download | kolla-f9def021d86caecfd57018f41792f8a7c6bc6a80.tar.gz kolla-f9def021d86caecfd57018f41792f8a7c6bc6a80.zip | |
Change lang package block order
Fix offline installation of language pack packages.
Change-Id: I9f4a21bbf1c8383e21e59350206aba3424602270
Closes-bug: #1883233
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 4d6c908a9..96b631884 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') %} |