docker: fix 'Empty continuation line found' warnings

Whitespaces suxx ;D

Change-Id: I4bfd437c914680a5dcbc67dfe9b0a9a74e2eb35d
changes/75/698875/3
Marcin Juszkiewicz 3 years ago
parent 308e85aa41
commit 5e4ade198f
  1. 8
      docker/base/Dockerfile.j2
  2. 12
      docker/bifrost/bifrost-base/Dockerfile.j2
  3. 6
      docker/fluentd/Dockerfile.j2

@ -194,13 +194,13 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
] %}
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \
{% for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') -%}
{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %}
{%- if distro_package_manager == 'dnf' %}
&& dnf config-manager --disable {{ repo }} \
{% else %}
{%- else %}
&& yum-config-manager --disable {{ repo }} \
{% endif -%}
{% endfor -%}
{%- endif -%}
{%- endfor %}
{% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%}
&& rpm --import {{ key }} \
{% endfor -%}

@ -39,19 +39,19 @@ RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list
ENV ANSIBLE_GATHER_TIMEOUT=30
{% block bifrost_ansible_install %}
{% if base_package_type == 'deb' %}
{%- if base_package_type == 'deb' %}
RUN apt-get update && \
{% else %}
{%- else %}
RUN echo " " && \
{% endif %}
{%- endif %}
bash -c './scripts/env-setup.sh && source ./env-vars && \
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
-e @/tmp/build_arg.yml && \
{% if base_package_type == 'deb' %}
{%- if base_package_type == 'deb' %}
apt-get clean && rm -rf /var/lib/apt/lists/*'
{% else %}
{%- else %}
yum clean all && rm -rf /var/yum/cache'
{% endif %}
{%- endif %}
{% endblock %}
{% endif %}

@ -107,11 +107,11 @@ ARG monasca_output_plugin_url=https://github.com/monasca/fluentd-monasca/archive
RUN curl -sSL $monasca_output_plugin_url -o /tmp/fluentd-monasca.tar.gz \
&& tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \
&& cd /tmp/fluentd-monasca-* \
{% if fluentd_user == 'fluentd' %}
{%- if fluentd_user == 'fluentd' %}
&& gem build fluentd-monasca-output.gemspec \
{% else %}
{%- else %}
&& td-agent-gem build fluentd-monasca-output.gemspec \
{% endif %}
{%- endif %}
&& {{ macros.install_fluent_plugins(fluentd_user, ['fluentd-monasca-output-*.gem'], chain=True) }} \
&& rm -rf /tmp/fluentd*

Loading…
Cancel
Save