From 97d74c37b62223a9f61a9b0fdb5e316d18fb4fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20THEROND?= <gael.therond@bitswalk.com>
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)
(cherry picked from commit 714e1feaea947b6a014d34e5a9cecfc777472ca1)
---
 docker/base/Dockerfile.j2 | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 83f6599e9c..1a6c310e4b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -61,21 +61,6 @@ COPY yum.conf /etc/yum.conf
 
 {% endblock %}
 
-# Install what is needed for en_US.UTF-8
-{% block base_centos_distro_sync_and_languages %}
-
-{% if distro_package_manager == 'dnf' %}
-    {% 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) }}
-{% endif %}
-
-{% endblock %}
-
 #### BEGIN REPO ENABLEMENT
 {% set base_yum_repo_files = [
  ] %}
@@ -171,6 +156,23 @@ 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 %}
+
+{% if distro_package_manager == 'dnf' %}
+
+{% 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) }}
+
+{% endif %}
+
+{% endblock %}
+
 {{ macros.install_packages(base_yum_url_packages | customizable("yum_url_packages")) }}
 
 {% for key in base_yum_repo_keys | customizable('yum_repo_keys') %}