diff options
| author | Sven Kieske <kieske@osism.tech> | 2023-09-13 19:38:59 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-11-30 07:07:31 +0000 |
| commit | c0aee4adb69e25f0e75fc9f907cf962ef024f358 (patch) | |
| tree | c76ff1d04db66489d50fe53c1761736e9efcef33 /docker/fluentd/Dockerfile.j2 | |
| parent | 30fd4b00eeb3aaabb615473df96aead9b34d0f0f (diff) | |
| download | kolla-c0aee4adb69e25f0e75fc9f907cf962ef024f358.tar.gz kolla-c0aee4adb69e25f0e75fc9f907cf962ef024f358.zip | |
bump td-agent lts from v4 to v5
notice that the td-agent command got renamed to fluentd.
see also the upgrade notes at[0].
for more details, refer to the changelog[1].
[0]: https://web.archive.org/web/20231006084137/https://www.fluentd.org/blog/upgrade-td-agent-v4-to-v5
[1]: https://github.com/fluent/fluent-package-builder/blob/b4b7017c09d78f2c404db62612733b40f69668a6/CHANGELOG.md#release-v500---20230729
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/901509
Change-Id: I5e95363c6c180e330945fe3d98e97c7049bbd6f7
Signed-off-by: Sven Kieske <kieske@osism.tech>
Diffstat (limited to 'docker/fluentd/Dockerfile.j2')
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 5195b175d..a992384f4 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -1,23 +1,23 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% set fluentd_user = 'td-agent' %} +{% set fluentd_user = 'fluentd' %} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" fluentd_binary="td-agent" fluentd_user="{{ fluentd_user }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" fluentd_binary="fluentd" fluentd_user="{{ fluentd_user }}" {% endblock %} {% block fluentd_header %}{% endblock %} {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['td-agent']) }} +{{ macros.enable_extra_repos(['fluentd']) }} {% if base_package_type == 'rpm' %} {% set fluentd_packages = [ 'gcc-c++', 'make', - 'td-agent', + 'fluent-package', ] %} {% elif base_package_type == 'deb' %} @@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set fluentd_packages = [ 'g++', 'make', - 'td-agent', + 'fluent-package', ] %} {% endif %} |