aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-10 12:09:14 +0000
committerGerrit Code Review <review@openstack.org>2016-03-10 12:09:14 +0000
commit4a5859bb4690bed22c3d8ca44aa376d2058d440b (patch)
tree1c099a2fe098fcc6d22bc962fb2cbdd5672c641a
parent2469425a8a6246a92151d67236d92532d6b36c94 (diff)
parent4dd60575f267654fbf0c3c2670bc31173e66ab4b (diff)
downloadkolla-4a5859bb4690bed22c3d8ca44aa376d2058d440b.tar.gz
kolla-4a5859bb4690bed22c3d8ca44aa376d2058d440b.zip
Merge "Add missing 'yum clean all' in oraclelinux base"
-rw-r--r--docker/base/Dockerfile.j23
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index e22ecbe91..229087ef2 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -84,7 +84,8 @@ RUN yum install -y \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
&& yum clean all
RUN yum-config-manager --enable ol7_optional_latest ol7_addons
-RUN yum install -y yum-plugin-priorities
+RUN yum install -y yum-plugin-priorities \
+ && yum clean all
{% endif %}
{# Endif for base_distro oraclelinux #}