diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-04 12:13:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-04 12:13:56 +0000 |
| commit | 578d3a8338c2b08d87ff1d66611ca37fa5d2351c (patch) | |
| tree | d7efb6bed11815e761720f15f9639ec172d792cb | |
| parent | 3a65b17da7b98c83dbfda432af88bb56d3501de9 (diff) | |
| parent | 9723832192f81b040823dbe802ebd1c199abc269 (diff) | |
| download | kolla-578d3a8338c2b08d87ff1d66611ca37fa5d2351c.tar.gz kolla-578d3a8338c2b08d87ff1d66611ca37fa5d2351c.zip | |
Merge "do not set contentdir to 'centos' on 'rhel'"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 11 |
1 files changed, 7 insertions, 4 deletions
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 = [ |