diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2019-08-16 13:12:31 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2019-08-19 18:17:06 +0200 |
| commit | f4e0bbd3fb31fa6d24b0116e32f662691645a00d (patch) | |
| tree | d9c080032dcb52c5efa7d8c2001fdb6f0c743a20 /docker/macros.j2 | |
| parent | be2bc668667b623f580af2a28fe7caaa15ef06b8 (diff) | |
| download | kolla-f4e0bbd3fb31fa6d24b0116e32f662691645a00d.tar.gz kolla-f4e0bbd3fb31fa6d24b0116e32f662691645a00d.zip | |
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
Diffstat (limited to 'docker/macros.j2')
| -rw-r--r-- | docker/macros.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
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(' ') }} |