Release v1.1.0 (#34)

* feat[deps]: Updated Ruby Gems Signed-off-by: Steve Hipwell <[email protected]> * feat[deps]: Updated Alpine to v3.17.0 Signed-off-by: Steve Hipwell <[email protected]> * feat[deps]: Updated Debian to v3.1.3-slim-bullseye Signed-off-by: Steve Hipwell <[email protected]> Signed-off-by: Steve Hipwell <[email protected]>
fluent · Dec 7, 2022 · c9d56aa · c9d56aa
1 parent 9de7e8f
commit c9d56aa
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,8 +17,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Deprecated
 - Removed -->
 
+## [v1.1.0] - 2022-12-07
+
+### All Changes
+
+- Updated `fluent-plugin-opensearch` to `v1.0.9`. ([#34](https://github.com/fluent/fluentd-aggregator-docker-image/pull/34)) [@stevehipwell](https://github.com/stevehipwell)
+- Updated `json` from `v2.6.2` to `v2.6.3`. ([#34](https://github.com/fluent/fluentd-aggregator-docker-image/pull/34)) [@stevehipwell](https://github.com/stevehipwell)
+- Added `libxml-ruby` to support AWS gems. ([#34](https://github.com/fluent/fluentd-aggregator-docker-image/pull/34)) [@stevehipwell](https://github.com/stevehipwell)
+- Updated _Alpine_ from `v3.16.3` to `v3.17.0`. ([#34](https://github.com/fluent/fluentd-aggregator-docker-image/pull/34)) [@stevehipwell](https://github.com/stevehipwell)
+- Updated _Debian_ from `v3.1.2-slim-bullseye` to `v3.1.3-slim-bullseye`. ([#34](https://github.com/fluent/fluentd-aggregator-docker-image/pull/34)) [@stevehipwell](https://github.com/stevehipwell)
+
 ## [v1.0.0] - 2022-11-21
 
 ### All Changes
 
-- Added initial version based on Fluentd [v1.15.3](https://github.com/fluent/fluentd/releases/tag/v1.15.3).
+- Added initial version based on Fluentd [v1.15.3](https://github.com/fluent/fluentd/releases/tag/v1.15.3). [@stevehipwell](https://github.com/stevehipwell)
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,8 @@
 source "https://rubygems.org"
 
+gem "libxml-ruby", "3.2.4"
 gem "oj", "3.13.23"
-gem "json", "2.6.2"
+gem "json", "2.6.3"
 gem "async", "1.30.3"
 gem "async-http", "0.59.3"
 gem "fluentd", "1.15.3"
@@ -13,7 +14,7 @@ gem "fluent-plugin-datadog", "0.14.2"
 gem "fluent-plugin-elasticsearch", "5.2.4"
 gem "fluent-plugin-grafana-loki", "1.2.18"
 gem "fluent-plugin-kafka", "0.18.1"
-gem "fluent-plugin-opensearch", "1.0.8"
+gem "fluent-plugin-opensearch", "1.0.9"
 gem "fluent-plugin-prometheus", "2.0.3"
 gem "fluent-plugin-record-modifier", "2.1.1"
 gem "fluent-plugin-rewrite-tag-filter", "2.4.0"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -18,14 +18,14 @@ GEM
     async-pool (0.3.12)
       async (>= 1.25)
     aws-eventstream (1.2.0)
-    aws-partitions (1.650.0)
+    aws-partitions (1.665.0)
     aws-sdk-cloudwatchlogs (1.53.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.164.0)
+    aws-sdk-core (3.168.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
@@ -60,7 +60,7 @@ GEM
       multi_json
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    excon (0.93.1)
+    excon (0.94.0)
     faraday (1.10.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -122,7 +122,7 @@ GEM
       fluentd (>= 0.10.58, < 2)
       ltsv
       ruby-kafka (>= 1.4.0, < 2)
-    fluent-plugin-opensearch (1.0.8)
+    fluent-plugin-opensearch (1.0.9)
       aws-sdk-core (~> 3)
       excon
       faraday (~> 1.10)
@@ -164,7 +164,8 @@ GEM
       domain_name (~> 0.5)
     http_parser.rb (0.8.0)
     jmespath (1.6.1)
-    json (2.6.2)
+    json (2.6.3)
+    libxml-ruby (3.2.4)
     ltsv (0.1.2)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
@@ -238,15 +239,16 @@ DEPENDENCIES
   fluent-plugin-elasticsearch (= 5.2.4)
   fluent-plugin-grafana-loki (= 1.2.18)
   fluent-plugin-kafka (= 0.18.1)
-  fluent-plugin-opensearch (= 1.0.8)
+  fluent-plugin-opensearch (= 1.0.9)
   fluent-plugin-prometheus (= 2.0.3)
   fluent-plugin-record-modifier (= 2.1.1)
   fluent-plugin-rewrite-tag-filter (= 2.4.0)
   fluent-plugin-route (= 1.0.0)
   fluent-plugin-s3 (= 1.7.2)
   fluent-plugin-sqs (= 3.0.0)
   fluentd (= 1.15.3)
-  json (= 2.6.2)
+  json (= 2.6.3)
+  libxml-ruby (= 3.2.4)
   oj (= 3.13.23)
 
 BUNDLED WITH

diff --git a/alpine.dockerfile b/alpine.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16.3
+FROM alpine:3.17.0
 
 ENV FLUENTD_DISABLE_BUNDLER_INJECTION="1"
 
@@ -11,11 +11,13 @@ RUN apk update \
   && apk add --no-cache \
   ca-certificates \
   ruby ruby-irb ruby-etc ruby-webrick \
-  tini \
   libcurl \
+  libxml2 libxslt \
+  tini \
   && apk add --no-cache --virtual .build-deps \
   build-base linux-headers \
   ruby-dev gnupg \
+  libxml2-dev libxslt-dev \
   && echo 'gem: --no-document' >> /etc/gemrc \
   && gem install bundler --version 2.3.7 \
   && bundle config silence_root_warning true \

diff --git a/debian.dockerfile b/debian.dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.1.2-slim-bullseye
+FROM ruby:3.1.3-slim-bullseye
 
 ENV FLUENTD_DISABLE_BUNDLER_INJECTION="1"
 
@@ -9,10 +9,14 @@ COPY Gemfile Gemfile.lock /fluentd/
 # therefore an 'apt-get purge' has no effect
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-  ca-certificates libjemalloc2 tini \
+  ca-certificates \
+  libjemalloc2 \
+  libxml2 libxslt1.1 \
+  tini \
   && buildDeps=" \
   make gcc g++ libc-dev \
   wget bzip2 gnupg dirmngr \
+  libxml2-dev libxslt1-dev \
   " \
   && apt-get install -y --no-install-recommends $buildDeps \
   && echo 'gem: --no-document' >> /etc/gemrc \