From 9723832192f81b040823dbe802ebd1c199abc269 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 4 Jun 2018 02:43:22 +0200 Subject: do not set contentdir to 'centos' on 'rhel' commit ec5daaaa634351d24706e605c2c6726be402d35b wrongly did this for rhel too Change-Id: I202ea5341f8db315b90367cbdef5c7b26567738b --- docker/base/Dockerfile.j2 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'docker/base') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 703bdfb8f..75f06d5a8 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -40,18 +40,21 @@ 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/yum.conf +{% block base_yum_conf %} + +COPY yum.conf /etc/yum.conf +{% endblock %} + +{% if base_distro in ['centos'] %} {% set centos_contentdir = 'centos' %} {% if base_arch in ['aarch64', 'ppc64le'] %} {% set centos_contentdir = 'altarch' %} {% endif %} -{% block base_yum_conf %} - -COPY yum.conf /etc/yum.conf RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir +{% endif %} -{% endblock %} #### BEGIN REPO ENABLEMENT {% set base_yum_repo_files = [ -- cgit v1.2.3