diff options
| author | Viktor Michalek <viktor.michalek@ultimum.io> | 2019-10-01 17:24:55 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-10-02 01:55:10 -0700 |
| commit | 4b308690bc23049ff903a6024473532bdc9b3484 (patch) | |
| tree | 816e5ed6b1ccdad904bc5b8425fff90ddf93804d | |
| parent | 121503e58902d706cee67c26bda4a6bef35848a7 (diff) | |
| download | kolla-4b308690bc23049ff903a6024473532bdc9b3484.tar.gz kolla-4b308690bc23049ff903a6024473532bdc9b3484.zip | |
Fluentd: There is available td-agent pkg for Buster
Thanks a lot to Masahiro Nakagawa
https://github.com/treasure-data/omnibus-td-agent/issues/209#issuecomment-530340475
Change-Id: I9c4993436844d45bc9df2815659fa7c420910b01
| -rw-r--r-- | docker/base/sources.list.debian | 2 | ||||
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 8df4ecb67..fff7f6e88 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -18,4 +18,4 @@ deb http://buster-stein.debian.net/debian buster-stein-backports main deb http://buster-stein.debian.net/debian buster-stein-backports-nochange main # td-agent for fluentd -deb http://packages.treasuredata.com/3/debian/stretch stretch contrib +deb http://packages.treasuredata.com/3/debian/buster buster contrib diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 83ceb2965..0c28b2d5b 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -87,6 +87,12 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start ] %} {% endif %} +# NOTE(hrw): one of plugins fetches 'string-scrub' which tries to use +# /usr/bin/mkdir directly while in Debian it is in /bin +{% if base_distro == 'debian' and base_arch == 'x86_64' %} +RUN ln -s /bin/mkdir /usr/bin/mkdir +{% endif %} + {{ macros.install_fluent_plugins(fluentd_user, fluentd_plugins | customizable("plugins")) }} {% endblock %} |