Browse Source

Merge "Change lang package block order"

changes/96/736096/6
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
5b4e00decc
1 changed files with 13 additions and 13 deletions
  1. +13
    -13
      docker/base/Dockerfile.j2

+ 13
- 13
docker/base/Dockerfile.j2 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 = [
] %}
@@ -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') %}


Loading…
Cancel
Save