From 4db7ec9404873541ffbf9a4d3550c1a36350756e Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 13 Dec 2023 17:20:01 +0000
Subject: [PATCH] chore: version bumps

---
 Dockerfile | 11 +----------
 Gemfile    | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bac2767..b9c4088 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
 #inspired from https://github.com/fluent/fluentd-docker-image/blob/master/v1.16/alpine/Dockerfile
-FROM alpine:3.17
-
-ARG version=1.16.0
+FROM alpine:3.18
 
 LABEL maintainer "Stefan Reimer<stefan@zero-downtime.net>"
 LABEL Description="Fluentd docker image intended as ingestion service" Vendor="Zero Down Time" Version="${version}"
@@ -20,13 +18,6 @@ RUN apk update \
         build-base linux-headers \
         ruby-dev gnupg \
  && echo 'gem: --no-document' >> /etc/gemrc \
- && gem install oj -v 3.14.2 \
- && gem install json -v 2.6.3 \
- && 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 ${version} \
- && gem install bigdecimal -v 1.4.4 \
  # Install additional gems from Gemfile
  && bundle config silence_root_warning true \
  && bundle install --gemfile=/fluentd/Gemfile \
diff --git a/Gemfile b/Gemfile
index ae52c30..91f40af 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,18 +4,20 @@
 source "https://rubygems.org"
 
 gem "ffi"
-gem "fluent-plugin-multi-format-parser"
-gem "fluent-plugin-concat"
-gem "fluent-plugin-grok-parser"
-gem "fluent-plugin-prometheus"
-gem 'fluent-plugin-json-in-json-2'
-gem "fluent-plugin-record-modifier"
-#gem "fluent-plugin-detect-exceptions"
-gem "fluent-plugin-rewrite-tag-filter"
-gem "fluent-plugin-parser-cri"
-gem "fluent-plugin-dedot_filter"
-gem "fluent-plugin-kubernetes_metadata_filter"
-# Since 7.14 Elastic only allows their own ES services ;-(
+gem "fluentd", "1.16.3"
+gem "oj", "~> 3.15.0"
+gem "rexml", "~> 3.2.5"
+gem "fluent-plugin-multi-format-parser", "~> 1.0.0"
+gem "fluent-plugin-concat", "~> 2.5.0"
+gem "fluent-plugin-grok-parser", "~> 2.6.2"
+gem "fluent-plugin-prometheus", "~> 2.1.0"
+gem 'fluent-plugin-json-in-json-2', ">= 1.0.2"
+gem "fluent-plugin-record-modifier", "~> 2.1.0"
+gem "fluent-plugin-detect-exceptions", "~> 0.0.13"
+gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
+gem "fluent-plugin-parser-cri", "~> 0.1.0"
 gem "elasticsearch", '>= 7', '< 7.14'
-gem "fluent-plugin-elasticsearch"
+gem "fluent-plugin-elasticsearch", "~> 5.2.5"
+gem "fluent-plugin-dedot_filter", "~> 1.0"
+gem "fluent-plugin-kubernetes_metadata_filter", "~> 3.2.0"
 gem "fluent-plugin-s3"