Browse Source

Change lang package block order

Fix offline installation of language pack packages.
Change-Id: I9f4a21bbf1c8383e21e59350206aba3424602270
Closes-bug: #1883233
(cherry picked from commit f9def021d8)
(cherry picked from commit 714e1feaea)
changes/56/738256/1
Gaël THEROND 1 month ago
committed by Radosław Piliszek
parent
commit
97d74c37b6
1 changed files with 17 additions and 15 deletions
  1. +17
    -15
      docker/base/Dockerfile.j2

+ 17
- 15
docker/base/Dockerfile.j2 View File

@@ -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') %}


Loading…
Cancel
Save