From b50aec68215353c65e145d490452c8300dbf5252 Mon Sep 17 00:00:00 2001 From: Jon Schlueter Date: Thu, 26 Jul 2018 13:36:17 -0400 Subject: add additional Remove yum cache as a followup to https://review.openstack.org/#/c/505143/ "Remove yum cache" Change-Id: Ifaaead6f6efe35808ebf79ea0d4474fbb60c8994 --- docker/base/Dockerfile.j2 | 9 ++++++--- docker/bifrost/bifrost-base/Dockerfile.j2 | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3d083290e..fc713d5e3 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -156,7 +156,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 {% endfor -%} {%- if base_centos_yum_repo_keys|customizable('centos_yum_repo_keys')|length == 0 %}RUN {% else %} && {% endif -%} yum -y update --security --sec-severity=Important --sec-severity=Critical \ - && yum clean all + && yum clean all \ + && rm -rf /var/cache/yum {% endif %} {# Endif for base_distro centos #} @@ -179,7 +180,8 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ && yum-config-manager --enable rhel-7-server-rhceph-2-mon-rpms \ && yum-config-manager --enable rhel-7-server-rhceph-2-tools-rpms \ && yum -y update --security --sec-severity=Important --sec-severity=Critical \ - && yum clean all + && yum clean all \ + && rm -rf /var/cache/yum {% endblock %} {% endif %} @@ -208,7 +210,8 @@ RUN yum -y install \ && yum -y install \ yum-plugin-priorities \ && yum -y update --security --sec-severity=Important --sec-severity=Critical \ - && yum clean all + && yum clean all \ + && rm -rf /var/cache/yum {% endblock %} {% endif %} diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index faeb74ace..05bd377ea 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -42,7 +42,7 @@ RUN echo " " && \ {% if base_distro in ['debian', 'ubuntu'] %} apt-get clean && rm -rf /var/lib/apt/lists/*' {% else %} - yum clean all' + yum clean all && rm -rf /var/yum/cache' {% endif %} {% endblock %} {% endif %} -- cgit v1.2.3