openstack
/
kolla
Code Issues Proposed changes

Guard adding contentdir RUN in base template 

As a follow up to I402cff1ac86a2ba108f2f5378cc98db5f6ecc673

only add the echo command if there is a value in centos_contentdir

Change-Id: Ie5144ee3b8bdb2535a32cfb43c43dfc1bb556ac8
This commit is contained in:
Jon Schlueter 2019-01-23 22:10:30 -05:00
parent 08775c3e6d
commit 819924a8e5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -48,10 +48,10 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version
{% if base_arch in ['aarch64', 'ppc64le'] %}
{% set centos_contentdir = 'altarch' %}
{% endif %}
RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
{% endif %}
COPY yum.conf /etc/yum.conf
RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
{% endblock %}