From 0cba3b2ccdcb556eaf31e520ec97e4e624baa01e Mon Sep 17 00:00:00 2001
From: Martin André <m.andre@redhat.com>
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/base/Dockerfile.j2 | 4 ++++
 docker/base/yum.conf      | 9 +++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 docker/base/yum.conf

(limited to 'docker/base')

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
-- 
cgit v1.2.3