From c31843ece95d4610cace1867def8589b8299fa10 Mon Sep 17 00:00:00 2001 From: Rafael Pissolatto Nunes Date: Thu, 4 Jan 2024 17:36:48 +0000 Subject: [PATCH 1/3] feat: bump up fluent-plugin-gcs version to 0.4.3 Signed-off-by: Rafael Pissolatto Nunes --- v1.16-ruby3.2/Dockerfile | 2 +- v1.16/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/v1.16-ruby3.2/Dockerfile b/v1.16-ruby3.2/Dockerfile index e7d1a26..3cb06e6 100644 --- a/v1.16-ruby3.2/Dockerfile +++ b/v1.16-ruby3.2/Dockerfile @@ -90,7 +90,7 @@ USER root RUN apk add --no-cache $BUILD_DEPS \ && touch /etc/gemrc \ - && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref 71a0932e75509545a2d28e337642ee1f973cca90 \ + && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref f18a48914cc0e09df313791c947ca7eb3d0d0148 \ && fluent-gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \ && fluent-gem install --file /Gemfile.outputs \ && find /usr/local/bundle/gems/ -newer /etc/gemrc -exec chown fluent:fluent {} \; \ diff --git a/v1.16/Dockerfile b/v1.16/Dockerfile index 13dcb3c..40ff474 100644 --- a/v1.16/Dockerfile +++ b/v1.16/Dockerfile @@ -86,7 +86,7 @@ USER root RUN apk add --no-cache $BUILD_DEPS \ && touch /etc/gemrc \ - && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref 71a0932e75509545a2d28e337642ee1f973cca90 \ + && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref f18a48914cc0e09df313791c947ca7eb3d0d0148 \ && fluent-gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \ && fluent-gem install --file /Gemfile.outputs \ && find /usr/local/bundle/gems/ -newer /etc/gemrc -exec chown fluent:fluent {} \; \ From 1f99932a0a3c88effb36b5623de20ff4364f34c3 Mon Sep 17 00:00:00 2001 From: Peter Wilcsinszky Date: Fri, 5 Jan 2024 10:10:46 +0100 Subject: [PATCH 2/3] Update gcs plugin to latest master Signed-off-by: Peter Wilcsinszky --- v1.16-ruby3.2/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/v1.16-ruby3.2/Dockerfile b/v1.16-ruby3.2/Dockerfile index 3cb06e6..5d4db99 100644 --- a/v1.16-ruby3.2/Dockerfile +++ b/v1.16-ruby3.2/Dockerfile @@ -90,7 +90,8 @@ USER root RUN apk add --no-cache $BUILD_DEPS \ && touch /etc/gemrc \ - && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref f18a48914cc0e09df313791c947ca7eb3d0d0148 \ + # TODO get rid of this by submitting the patch upstream + && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref ad6a7cb0f166e2c1648954a928e1e9b8cdcbf93d \ && fluent-gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \ && fluent-gem install --file /Gemfile.outputs \ && find /usr/local/bundle/gems/ -newer /etc/gemrc -exec chown fluent:fluent {} \; \ From 3296d51040e93d5bb96009e5490a3b6060322188 Mon Sep 17 00:00:00 2001 From: Peter Wilcsinszky Date: Fri, 5 Jan 2024 10:12:02 +0100 Subject: [PATCH 3/3] Update Dockerfile Signed-off-by: Peter Wilcsinszky --- v1.16/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/v1.16/Dockerfile b/v1.16/Dockerfile index 40ff474..1509650 100644 --- a/v1.16/Dockerfile +++ b/v1.16/Dockerfile @@ -86,7 +86,8 @@ USER root RUN apk add --no-cache $BUILD_DEPS \ && touch /etc/gemrc \ - && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref f18a48914cc0e09df313791c947ca7eb3d0d0148 \ + # TODO get rid of this by submitting the patch upstream + && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref ad6a7cb0f166e2c1648954a928e1e9b8cdcbf93d \ && fluent-gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \ && fluent-gem install --file /Gemfile.outputs \ && find /usr/local/bundle/gems/ -newer /etc/gemrc -exec chown fluent:fluent {} \; \