diff options
Diffstat (limited to 'docker')
| -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 b5a2b31fc..f07a725dc 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -18,4 +18,4 @@ deb http://buster-train.debian.net/debian buster-train-backports main deb http://buster-train.debian.net/debian buster-train-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 %} |