diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-02 17:51:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-02 17:51:05 +0000 |
| commit | 989bec307a40c91d4ec01a7407783d7d304df26c (patch) | |
| tree | 3e63a4b7d47a5dcc257a7ef180fdf943d3c2ea13 /docker | |
| parent | 3e09b366a7f49cf8fbc67898a4efd33a08406be8 (diff) | |
| parent | 4b308690bc23049ff903a6024473532bdc9b3484 (diff) | |
| download | kolla-989bec307a40c91d4ec01a7407783d7d304df26c.tar.gz kolla-989bec307a40c91d4ec01a7407783d7d304df26c.zip | |
Merge "Fluentd: There is available td-agent pkg for Buster"
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 %} |