Fixup whitespace issue in chaining
base_rhel_package_installation block had whitespace isses depending on which branch of the if statement you had. this resulted in a blank line in the continued "\ \n &&" rendered Dockerfile Change-Id: I634f1bc01806e2606d611b3697e84b43278c4a9b
This commit is contained in:
parent
cd307fb1ab
commit
91c5453cc2
|
@ -168,11 +168,11 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
|
|||
RUN yum-config-manager --enable rhel-7-server-optional-rpms \
|
||||
&& yum -y install \
|
||||
yum-plugin-priorities \
|
||||
{% if install_type != 'binary' or install_metatype != 'rdo' %}
|
||||
{%- if install_type != 'binary' or install_metatype != 'rdo' %}
|
||||
&& yum -y install \
|
||||
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
|
||||
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 \
|
||||
{% endif %}
|
||||
{% endif -%}
|
||||
&& yum-config-manager --enable rhel-7-server-extras-rpms \
|
||||
&& yum-config-manager --enable rhel-7-server-rhceph-2-osd-rpms \
|
||||
&& yum-config-manager --enable rhel-7-server-rhceph-2-mon-rpms \
|
||||
|
|
Loading…
Reference in New Issue