Merge "Fluentd: There is available td-agent pkg for Buster"

changes/16/686316/1
Zuul 3 years ago committed by Gerrit Code Review
commit 989bec307a
  1. 2
      docker/base/sources.list.debian
  2. 6
      docker/fluentd/Dockerfile.j2

@ -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

@ -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 %}

Loading…
Cancel
Save