Renovation

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2020 Volt Grid Pty Ltd
+Copyright (c) 2017-2023,2025 Volt Grid Pty Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -6,7 +6,6 @@ Panubo's customised fluentd Docker images.
 
 **Unmaintained**
 
-- [alpine](alpine/README.md) - Based on official optimised Alpine image.
 - [stress-tester](stess-tester) - Fluentd image that continuously outputs log messages for testing logging systems.
 
 ## License
@@ -20,7 +19,6 @@ This includes the following plugins:
 - [Systemd](https://github.com/reevoo/fluent-plugin-systemd)
 - [Amazon S3](https://github.com/fluent/fluent-plugin-s3)
 - [CloudWatch Logs](https://github.com/fluent-plugins-nursery/fluent-plugin-cloudwatch-logs)
-- [Google Cloud Logging](https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud)
 
 ## Systemd
 

debian/Dockerfile

@@ -1,4 +1,4 @@
-FROM fluent/fluentd:v1.14.6-debian-1.1
+FROM fluent/fluentd:v1.19.0-debian-2.1
 
 COPY fluent.conf /fluentd/etc/fluent.conf
 
@@ -17,11 +17,12 @@ RUN set -x \
   && apt-get -y install libsystemd0 \
   && export BUILD_DEPS='ruby-dev gcc g++ make libc-dev libffi-dev' \
   && apt-get install -y --no-install-recommends ${BUILD_DEPS} \
-  && gem install bundler --version 2.0.2 \
-  && bundle install --gemfile=/fluentd/Gemfile --path=/fluentd/vendor/bundle --deployment \
+  && gem install bundler --version 2.1.4 \
+  && bundle install --gemfile=/fluentd/Gemfile \
   && gem sources --clear-all \
   && apt-get --purge autoremove -y ${BUILD_DEPS} \
   && apt-get clean && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/* \
-  && rm -rf /fluentd/vendor/bundle/ruby/2.6.0/cache/* /usr/local/lib/ruby/gems/2.6.0/cache/* /root/.bundle/cache/* \
+  && rm -rf ${GEM_HOME}/cache/* ${GEM_HOME}/cache/* /root/.bundle/cache/* \
   ;
+
 USER fluent

debian/Dockerfile.update

@@ -1,11 +1,11 @@
-FROM fluent/fluentd:v1.14.6-debian-1.1
+FROM fluent/fluentd:v1.19.0-debian-2.1
 
 # Install plugins
 USER root
 
-ENV PATH /fluentd/vendor/bundle/ruby/2.6.0/bin:$PATH
-ENV GEM_PATH /fluentd/vendor/bundle/ruby/2.6.0
-ENV GEM_HOME /fluentd/vendor/bundle/ruby/2.6.0
+ENV PATH /fluentd/vendor/bundle/ruby/3.4.0/bin:$PATH
+ENV GEM_PATH /fluentd/vendor/bundle/ruby/3.4.0
+ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.4.0
 # skip runtime bundler installation
 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
 
@@ -14,7 +14,7 @@ RUN set -x \
   && apt-get -y install libsystemd0 \
   && export BUILD_DEPS='ruby-dev gcc g++ make libc-dev libffi-dev' \
   && apt-get install -y --no-install-recommends ${BUILD_DEPS} \
-  && gem install bundler --version 2.0.2 \
+  && gem install bundler --version 2.1.4 \
   ;
 
 COPY Gemfile /fluentd/

debian/Gemfile

@@ -6,29 +6,27 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # gem "rails"
 
-gem "fluent-plugin-record-modifier", "~> 2.0"
+gem "fluent-plugin-record-modifier", "~> 2.2"
 
-gem "fluent-plugin-concat", "~> 2.4"
+gem "fluent-plugin-concat", "~> 2.6"
 
-gem "fluent-plugin-detect-exceptions", "~> 0.0.12"
+gem "fluent-plugin-detect-exceptions", "~> 0.0"
 
-gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.2"
+gem "fluent-plugin-kubernetes_metadata_filter", "~> 2.4"
 
-gem "fluent-plugin-multi-format-parser", "~> 1.0"
+gem "fluent-plugin-multi-format-parser", "~> 1.1"
 
-gem "fluent-plugin-prometheus", "~> 1.4"
+gem "fluent-plugin-prometheus", "~> 2.2"
 
-gem "oj", "~> 3.8"
+gem "oj", "~> 3.16"
 
-gem "fluent-plugin-systemd", "~> 1.0"
+gem "fluent-plugin-systemd", "~> 1.1"
 
-gem "fluent-plugin-cloudwatch-logs", "~> 0.14.2"
+gem "fluent-plugin-cloudwatch-logs", "~> 0.15"
 
-gem "fluent-plugin-s3", "~> 1.1"
+gem "fluent-plugin-s3", "~> 1.8"
 
-gem "fluent-plugin-sumologic_output", "~> 1.5"
-
-gem "fluent-plugin-google-cloud", "~> 0.12.0"
+gem "fluent-plugin-sumologic_output", "~> 1.9"
 
 gem "fluent-plugin-filter_where", "~> 1.0"