diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-19 09:58:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-19 09:58:24 +0000 |
| commit | 2627e3c009b580ef7f28eb3814f019f456674b3f (patch) | |
| tree | 64a46db8ed08f324f22a37ea33bc6ef0c4c3cfdd /docker | |
| parent | 359fb0c7b1c754ed5f5a7daabc9355ac2197c8c4 (diff) | |
| parent | 0cba3b2ccdcb556eaf31e520ec97e4e624baa01e (diff) | |
| download | kolla-2627e3c009b580ef7f28eb3814f019f456674b3f.tar.gz kolla-2627e3c009b580ef7f28eb3814f019f456674b3f.zip | |
Merge "Permit changing yum configuration in the base image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/base/yum.conf | 9 | ||||
| -rw-r--r-- | docker/macros.j2 | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2f5b5ea98..60603ec5f 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -40,6 +40,10 @@ 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 %} + #### BEGIN REPO ENABLEMENT {% set base_yum_repo_files = [ ] %} diff --git a/docker/base/yum.conf b/docker/base/yum.conf new file mode 100644 index 000000000..6714771e8 --- /dev/null +++ b/docker/base/yum.conf @@ -0,0 +1,9 @@ +[main] +keepcache=0 +logfile=/var/log/yum.log +exactarch=1 +obsoletes=1 +gpgcheck=1 +plugins=1 +installonly_limit=0 +skip_missing_names_on_install=False diff --git a/docker/macros.j2 b/docker/macros.j2 index 8c323cde6..3be0ef5e1 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -1,7 +1,7 @@ {% macro install_packages(packages) -%} {% if packages is defined and packages|length > 0 -%} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] -%} - RUN yum --setopt skip_missing_names_on_install=False -y install {{ packages | join(' ') }} && yum clean all + RUN yum -y install {{ packages | join(' ') }} && yum clean all {%- elif base_distro in ['debian', 'ubuntu'] -%} {#- debian_package_install is a utility method to build up an appropriate |