diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-05-13 18:16:11 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-05-13 16:39:44 +0000 |
| commit | ec5daaaa634351d24706e605c2c6726be402d35b (patch) | |
| tree | ec2eb55397449212f5aa8e2ee38056bd12d85801 /docker/base | |
| parent | 000159cb6d5da0fffe0ba73051c6c551a0cdd9bd (diff) | |
| download | kolla-ec5daaaa634351d24706e605c2c6726be402d35b.tar.gz kolla-ec5daaaa634351d24706e605c2c6726be402d35b.zip | |
base: set $contentdir for CentOS
CentOS recently started syncing alternate arch repos to mirrors. And to
make it easier to play with centos-* packages idea of 'contentdir'
appeared.
https://lists.centos.org/pipermail/centos-devel/2018-March/016542.html
Change-Id: Ieb26c0aa65ba3ec1a45a33f87f670e5ecb782f82
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 264d87dd2..926bb316e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -40,8 +40,17 @@ 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 +{% 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 + {% endblock %} #### BEGIN REPO ENABLEMENT |