From f4e0bbd3fb31fa6d24b0116e32f662691645a00d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 16 Aug 2019 13:12:31 +0200 Subject: fluentd: there is no 'td-agent' for Debian/x86-64 As there is no 'td-agent' package image build fails on 'x86-64'. We have to wait for TD Agent 4. Change-Id: I03d38628eee0f0823a58cba3a70df22f29022956 --- docker/macros.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/macros.j2') diff --git a/docker/macros.j2 b/docker/macros.j2 index 25d3a3752..50adf8bb6 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -111,7 +111,7 @@ RUN apt-get update \ {%- if base_distro in ['centos', 'oraclelinux', 'rhel'] -%} ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }} {%- elif base_distro in ['debian', 'ubuntu'] -%} - {%- if base_arch == 'x86_64' -%} + {%- if base_arch == 'x86_64' and base_distro == 'ubuntu' -%} ulimit -n 65536 && td-agent-gem install {{ plugins | join(' ') }} {%- else -%} ulimit -n 65536 && gem install --minimal-deps {{ plugins | join(' ') }} -- cgit v1.2.3