From d85f514506d1b94b3123994737c3dfd45593d5bd Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Tue, 11 Jun 2024 12:36:06 -0400 Subject: [PATCH] Upgrade fluentd to 1.17.0. Signed-off-by: Josh Baird --- cmd/fluent-watcher/fluentd/Dockerfile.amd64 | 4 ++-- cmd/fluent-watcher/fluentd/Dockerfile.arm64 | 4 ++-- cmd/fluent-watcher/fluentd/Dockerfile.arm64.base | 2 +- cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick | 2 +- cmd/fluent-watcher/fluentd/base/Dockerfile | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.amd64 b/cmd/fluent-watcher/fluentd/Dockerfile.amd64 index 0aebe76e1..352f39ab1 100644 --- a/cmd/fluent-watcher/fluentd/Dockerfile.amd64 +++ b/cmd/fluent-watcher/fluentd/Dockerfile.amd64 @@ -9,7 +9,7 @@ RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cm # Fluentd main image FROM alpine:3.19 -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -27,7 +27,7 @@ RUN apk update \ && gem install json -v 2.6.2 \ && gem install async -v 1.30.3 \ && gem install async-http -v 0.56.6 \ - && gem install fluentd -v 1.15.3 \ + && gem install fluentd -v 1.17.0 \ && gem install bigdecimal -v 1.4.4 \ # NOTE: resolv v0.2.1 includes the fix for CPU spike issue due to DNS resolver. # This hack is needed for Ruby 2.6.7, 2.7.3 and 3.0.1. (alpine image is still kept on 2.7.3) diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64 b/cmd/fluent-watcher/fluentd/Dockerfile.arm64 index 77bbb398a..fd7d3dc5a 100644 --- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64 +++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64 @@ -17,7 +17,7 @@ RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/q # Fluentd main image FROM arm64v8/ruby:3.3-slim-bullseye COPY --from=builderqemu /go/qemu-aarch64-static /usr/bin/ -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0" ENV TINI_VERSION=0.18.0 # Do not split this into multiple RUN! @@ -37,7 +37,7 @@ RUN apt-get update \ && gem install rexml -v 3.2.5 \ && gem install async -v 1.30.3 \ && gem install async-http -v 0.56.6 \ - && gem install fluentd -v 1.15.3 \ + && gem install fluentd -v 1.17.0 \ && gem install bigdecimal -v 1.4.4 \ && gem install resolv -v 0.2.1 \ && gem install elasticsearch -v 7.13.3 \ diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base index 51552618a..aaa229c40 100644 --- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base +++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base @@ -8,7 +8,7 @@ RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/q # Fluentd main image FROM arm64v8/ruby:3.3-slim-bullseye COPY --from=builderqemu /go/qemu-aarch64-static /usr/bin/ -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0" ENV TINI_VERSION=0.18.0 # Do not split this into multiple RUN! diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick index 58b823c36..8eedc149e 100644 --- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick +++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick @@ -21,7 +21,7 @@ RUN buildDeps=" \ make gcc g++ libc-dev \ wget bzip2 gnupg dirmngr\ " \ - && gem install fluentd -v 1.15.3 \ + && gem install fluentd -v 1.17.0 \ && apt-get purge -y --auto-remove \ -o APT::AutoRemove::RecommendsImportant=false \ $buildDeps \ diff --git a/cmd/fluent-watcher/fluentd/base/Dockerfile b/cmd/fluent-watcher/fluentd/base/Dockerfile index d3ca573a7..267a49704 100644 --- a/cmd/fluent-watcher/fluentd/base/Dockerfile +++ b/cmd/fluent-watcher/fluentd/base/Dockerfile @@ -2,7 +2,7 @@ # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb FROM alpine:3.17.3 -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -21,7 +21,7 @@ RUN apk update \ && gem install rexml -v 3.2.5 \ && gem install async -v 1.30.3 \ && gem install async-http -v 0.56.6 \ - && gem install fluentd -v 1.15.3 \ + && gem install fluentd -v 1.17.0 \ && gem install bigdecimal -v 1.4.4 \ # NOTE: resolv v0.2.1 includes the fix for CPU spike issue due to DNS resolver. # This hack is needed for Ruby 2.6.7, 2.7.3 and 3.0.1. (alpine image is still kept on 2.7.3)