Change lang package block order

Fix offline installation of language pack packages.
Change-Id: I9f4a21bbf1c8383e21e59350206aba3424602270
Closes-bug: #1883233
(cherry picked from commit f9def021d8)
This commit is contained in:
Gaël THEROND 2020-06-12 16:22:22 +02:00 committed by Radosław Piliszek
parent ca4347d6c4
commit 714e1feaea
1 changed files with 13 additions and 13 deletions

View File

@ -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 = [
] %}
@ -154,6 +141,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') %}