openstack
/
kolla
Code Issues Proposed changes

Merge "add additional Remove yum cache"

This commit is contained in:
Zuul 2018-07-27 08:32:31 +00:00 committed by Gerrit Code Review
parent 2b023ba13e b50aec6821
commit 4c4289eff9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/base/Dockerfile.j2
View File

@ -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 %}

2
docker/bifrost/bifrost-base/Dockerfile.j2
View File

@ -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 %}