diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-16 14:03:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-16 14:03:30 +0000 |
| commit | f0defeafd295459c0532b8296c86543c31a95728 (patch) | |
| tree | b5e02a36af585cc1b08958a9f43f95d0653eba78 /docker/base | |
| parent | 28ab9cb45162597fb8fec7bd8069b713488ad472 (diff) | |
| parent | 788978211326093e10795c611971ca8911e2a986 (diff) | |
| download | kolla-f0defeafd295459c0532b8296c86543c31a95728.tar.gz kolla-f0defeafd295459c0532b8296c86543c31a95728.zip | |
Merge "CentOS 8: Switch last mentions of yum to dnf"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index f6a67d9e9..f083a17e5 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -51,11 +51,13 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version && cat /tmp/kolla_bashrc >> /etc/bashrc \ && sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/dnf/dnf.conf +{% block base_dnf_conf %} {% block base_yum_conf %} 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 %} |