diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-17 23:26:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-17 23:26:52 +0000 |
| commit | 6f4e98c67898dea4834abf1cc435848247ee7c44 (patch) | |
| tree | d79f7a4544a1e08697995dc18951faebd279e240 | |
| parent | 540b0cf6d7da4f7a85c54af847d4f519471d6e27 (diff) | |
| parent | 5e4ade198f794e79ee02a21f77dddd9f1fd2d16e (diff) | |
| download | kolla-6f4e98c67898dea4834abf1cc435848247ee7c44.tar.gz kolla-6f4e98c67898dea4834abf1cc435848247ee7c44.zip | |
Merge "docker: fix 'Empty continuation line found' warnings"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 86c8286dd..48522109d 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/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 -%} diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 6b9f5f4d4..8cf1b62d6 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -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 %} diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 76fe1c322..5091efae6 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -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* |