diff options
| author | Martin André <m.andre@redhat.com> | 2017-06-15 15:42:06 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2017-06-15 15:44:41 +0200 |
| commit | 0cba3b2ccdcb556eaf31e520ec97e4e624baa01e (patch) | |
| tree | 9a640973b7a3f8f1cb649ae53774a3af7756ad59 /docker/macros.j2 | |
| parent | c90c576fb490564b9d4be9ba28940d9425b3f16e (diff) | |
| download | kolla-0cba3b2ccdcb556eaf31e520ec97e4e624baa01e.tar.gz kolla-0cba3b2ccdcb556eaf31e520ec97e4e624baa01e.zip | |
Permit changing yum configuration in the base image
This commit allows to configure yum settings via a yum.conf file that
is shipped in the base image and make it overridable with the
base_yum_conf jinja2 block.
Change-Id: I76a84ec008fec5696cadefdbdeb4204a32421c4b
Closes-Bug: #1698134
Diffstat (limited to 'docker/macros.j2')
| -rw-r--r-- | docker/macros.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
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 |