From d1dc5e8cb05d12f742dae50610fd8067697573e2 Mon Sep 17 00:00:00 2001 From: Dave Johansen Date: Fri, 7 Feb 2025 11:11:37 -0700 Subject: [PATCH 1/3] Upgrade to 1.17.1-1.1 --- CHANGELOG.md | 3 +++ Gemfile.lock | 2 +- VERSION | 2 +- docker/Dockerfile | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2957978..c03b9f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.8.19 - Feb 7, 2025 +- Update fluentd docker image to `v1.17.1-1.1` + ## 0.8.18 - June 13, 2024 - Update fluentd docker image to `v1.17.0-1.0` diff --git a/Gemfile.lock b/Gemfile.lock index 49651c2..a43ed71 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - fluent-plugin-scalyr (0.8.18) + fluent-plugin-scalyr (0.8.19) ffi (= 1.15.5) fluentd (>= 0.14.0, < 2) rbzip2 (= 0.3.0) diff --git a/VERSION b/VERSION index 492fd93..ad2cbac 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.8.18 +0.8.19 diff --git a/docker/Dockerfile b/docker/Dockerfile index dba5795..b2b2c43 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM fluent/fluentd:v1.17.0-1.0 +FROM fluent/fluentd:v1.17.1-1.1 USER root From f305750415b8a96c8524dcf4728a153f3b37ce3d Mon Sep 17 00:00:00 2001 From: Dave Johansen Date: Tue, 11 Feb 2025 20:35:37 -0700 Subject: [PATCH 2/3] Use ruby 3.2 since that's what Alpine 3.19 is using https://pkgs.alpinelinux.org/package/v3.19/main/x86_64/ruby https://github.com/fluent/fluentd-docker-image/blob/1a211639d25e4353224830586df3a568ca3e5274/v1.17/alpine/Dockerfile --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index f1f7d95..25937b8 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -18,7 +18,7 @@ jobs: - name: Setup ruby and install deps uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1 + ruby-version: 3.2 bundler-cache: true bundler: default From a61223f6fa8b640ab38d6e4b34dd15ef27dda34e Mon Sep 17 00:00:00 2001 From: Dave Johansen Date: Wed, 12 Feb 2025 17:46:06 -0700 Subject: [PATCH 3/3] Upgrade to 1.2 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b2b2c43..b390a23 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM fluent/fluentd:v1.17.1-1.1 +FROM fluent/fluentd:v1.17.1-1.2 USER root