From 0cba3b2ccdcb556eaf31e520ec97e4e624baa01e Mon Sep 17 00:00:00 2001 From: Martin André Date: Thu, 15 Jun 2017 15:42:06 +0200 Subject: 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 --- docker/macros.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/macros.j2') 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 -- cgit v1.2.3