diff options
| author | Jon Schlueter <jschluet@redhat.com> | 2019-01-23 22:10:30 -0500 |
|---|---|---|
| committer | Jon Schlueter <jschluet@redhat.com> | 2019-01-23 22:28:04 -0500 |
| commit | 819924a8e5f1609f0224a6ab56c3bad0b57dab44 (patch) | |
| tree | fddbf055d3be4d7137c1708e4025cda647cafedc /docker | |
| parent | 08775c3e6d49d32a51612a730b84892cf8e3a098 (diff) | |
| download | kolla-819924a8e5f1609f0224a6ab56c3bad0b57dab44.tar.gz kolla-819924a8e5f1609f0224a6ab56c3bad0b57dab44.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index e8e6300b0..2af3ae874 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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 %} |