From 714e1feaea947b6a014d34e5a9cecfc777472ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20THEROND?= Date: Fri, 12 Jun 2020 16:22:22 +0200 Subject: [PATCH] Change lang package block order Fix offline installation of language pack packages. Change-Id: I9f4a21bbf1c8383e21e59350206aba3424602270 Closes-bug: #1883233 (cherry picked from commit f9def021d86caecfd57018f41792f8a7c6bc6a80) --- docker/base/Dockerfile.j2 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index d5da5adbc7..6ffe0a4fd1 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 = [ ] %} @@ -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') %}