From 59a5de343ac3adf9463d7231fa0f5ff5f1f0a433 Mon Sep 17 00:00:00 2001 From: Sven Kieske Date: Wed, 31 May 2023 12:02:53 +0200 Subject: [PATCH] fluentd: pin td-agent to 4.4.2 Closes-Bug: #2019557 Change-Id: I3723e418c061c387c7f18cd33556ebb74ba1bd95 Signed-off-by: Sven Kieske --- docker/base/apt_preferences.debian | 5 +++++ docker/base/apt_preferences.ubuntu | 6 ++++++ docker/fluentd/Dockerfile.j2 | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 00b004072a..b59402cec9 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -12,6 +12,11 @@ Package: logstash-oss Pin: version 7.9.* Pin-Priority: 1000 +# FIXME(SvenKieske): Pinning to 4.4.2 to avoid bug 2019557 +Package: td-agent* +Pin: version 4.4.2-1 +Pin-Priority: 1000 + # NOTE(hrw): we do not want backports unless requested Package: * Pin: release n=bullseye-backports diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index d61b18bdcd..2b97bc8edc 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -11,3 +11,9 @@ Pin-Priority: 1000 Package: logstash-oss Pin: version 7.9.* Pin-Priority: 1000 + +# FIXME(SvenKieske): Pinning to 4.4.2 to avoid bug 2019557 +Package: td-agent* +Pin: version 4.4.2-1 +Pin-Priority: 1000 + diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 28fec327e9..ee1c20e88f 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set fluentd_packages = [ 'gcc-c++', 'make', - 'td-agent', + 'td-agent-4.4.2', ] %} {% elif base_package_type == 'deb' %}