Merge "Use td-agent-gem to install fluentd monasca plugin on ubuntu" into stable/stein
This commit is contained in:
commit
b20b550b9b
|
@ -82,7 +82,7 @@ RUN tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \
|
||||||
&& cd /tmp/fluentd-monasca-* \
|
&& cd /tmp/fluentd-monasca-* \
|
||||||
&& gem build fluentd-monasca-output.gemspec \
|
&& gem build fluentd-monasca-output.gemspec \
|
||||||
&& gem install fluentd-monasca-output-*.gem \
|
&& gem install fluentd-monasca-output-*.gem \
|
||||||
&& fluent-gem install fluentd-monasca-output-*.gem \
|
&& {{ macros.install_fluent_plugins(['fluentd-monasca-output-*.gem'], chain=True) }} \
|
||||||
&& rm -rf /tmp/fluentd*
|
&& rm -rf /tmp/fluentd*
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -105,12 +105,13 @@ RUN apt-get update \
|
||||||
&& chmod 755 /usr/bin/kubectl
|
&& chmod 755 /usr/bin/kubectl
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
{% macro install_fluent_plugins(plugins) -%}
|
{% macro install_fluent_plugins(plugins, chain=False) -%}
|
||||||
{% if plugins is defined and plugins|length > 0 -%}
|
{% if plugins is defined and plugins|length > 0 -%}
|
||||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] -%}
|
{% if not chain -%} RUN {% endif -%}
|
||||||
RUN ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }}
|
{%- if base_distro in ['centos', 'oraclelinux', 'rhel'] -%}
|
||||||
|
ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }}
|
||||||
{%- elif base_distro in ['debian', 'ubuntu'] -%}
|
{%- elif base_distro in ['debian', 'ubuntu'] -%}
|
||||||
RUN ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }}
|
ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- endmacro %}
|
{%- endmacro %}
|
||||||
|
|
Loading…
Reference in New Issue