From 711ec0829a95a12ae9e290aeb3837b457e1dd215 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Thu, 27 Jan 2022 10:57:48 +0000 Subject: Futureproof the uninstallation of offending es gems Uninstall based on version range. Change-Id: I353ef9b6b8da0e726c17ad2e06995d3690731e1d --- docker/fluentd/Dockerfile.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 9f8faf382..c9c8277ea 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -34,9 +34,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build # NOTE(frickler): Downgrading elasticsearch gems for compatibility with OSS versions of ES {{ macros.install_packages(fluentd_packages | customizable("packages")) }} \ && td-agent-gem install elasticsearch:7.13.0 \ - && td-agent-gem uninstall elasticsearch:7.15.0 \ - && td-agent-gem uninstall elasticsearch-api:7.15.0 \ - && td-agent-gem uninstall elasticsearch-transport:7.15.0 + && td-agent-gem uninstall "elasticsearch:>7.13.0" \ + && td-agent-gem uninstall "elasticsearch-api:>7.13.0" \ + && td-agent-gem uninstall "elasticsearch-transport:>7.13.0" COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers -- cgit v1.2.3