openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add a block around oraclelinux base package install"

Browse Source
This commit is contained in:
Jenkins 2016-08-31 14:59:46 +00:00 committed by Gerrit Code Review
commit c22af045e6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -114,6 +114,7 @@ RUN yum -y install \
{% if base_distro == 'oraclelinux' %} {% if base_distro == 'oraclelinux' %}
{% block base_oraclelinux_package_installation %}
COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
RUN yum -y install \ RUN yum -y install \
tar \ tar \
@ -133,6 +134,7 @@ RUN yum -y install \
&& yum -y install \ && yum -y install \
yum-plugin-priorities \ yum-plugin-priorities \
&& yum clean all && yum clean all
{% endblock %}
{% endif %} {% endif %}
{# Endif for base_distro oraclelinux #} {# Endif for base_distro oraclelinux #}