aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2020-03-16 15:16:31 +0000
committerMark Goddard <mark@stackhpc.com>2020-04-15 14:17:40 +0100
commit788978211326093e10795c611971ca8911e2a986 (patch)
tree988b081b5d4973bbf93b037a82f540bd6bd28986 /docker/base
parent53443c5c712f4ec23b859105e94bcd90abc27762 (diff)
downloadkolla-788978211326093e10795c611971ca8911e2a986.tar.gz
kolla-788978211326093e10795c611971ca8911e2a986.zip
CentOS 8: Switch last mentions of yum to dnf
Change-Id: I31e9742793cfb1abff9749083c9ce86000dae1af Partially-Implements: blueprint centos-rhel-8
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index a0a0ffebe..07dcc9461 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 %}