From 438c40ad02422e85db7579a16d91e60ebc81af71 Mon Sep 17 00:00:00 2001 From: Shizuo Fujita Date: Mon, 26 Oct 2026 12:32:09 +0900 Subject: [PATCH 1/3] Install yajl-ruby for plugins that require it fluentd 1.20.1 no longer depends on yajl-ruby. Some plugins still `require 'yajl'` without declaring it in their gemspec. Install it in the image so that those plugins keep working. Co-Authored-By: Claude Opus 5.5 Signed-off-by: Shizuo Fujita --- Dockerfile.template.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.template.erb b/Dockerfile.template.erb index 2c5892ea..604ed1a7 100644 --- a/Dockerfile.template.erb +++ b/Dockerfile.template.erb @@ -39,6 +39,7 @@ RUN refreshenv \ && gem install oj -v 3.17.3 \ && gem install json -v 2.19.9 \ && gem install rexml -v 3.4.4 \ +&& gem install yajl-ruby -v 1.4.3 \ && gem install fluentd -v <%= fluentd_ver %> \ && gem install win32-service -v 2.3.2 \ && gem install win32-ipc -v 0.7.0 \ @@ -66,6 +67,7 @@ RUN apt-get update \ && gem install rexml -v 3.4.4 \ && gem install async -v 2.24.0 \ && gem install async-http -v 0.89.0 \ + && gem install yajl-ruby -v 1.4.3 \ && gem install fluentd -v <%= fluentd_ver %> \ && unset MAKEFLAGS \ && export GEM_DIR=$(ruby -e 'puts Gem.dir') \ From 3233aff80548f5088228585e349c5896148e28d3 Mon Sep 17 00:00:00 2001 From: Shizuo Fujita Date: Mon, 26 Oct 2026 12:32:16 +0900 Subject: [PATCH 2/3] Bump version to v1.20.1 Co-Authored-By: Claude Opus 5.5 Signed-off-by: Shizuo Fujita --- Makefile | 10 +++++----- README.md | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index c1fc187c..412e73a4 100644 --- a/Makefile +++ b/Makefile @@ -17,19 +17,19 @@ IMAGE_NAME := fluent/fluentd X86_IMAGES := \ - v1.20/debian:v1.20.0-debian-amd64-1.0,v1.20-debian-amd64-1,v1.20.0-debian-amd64,edge-debian-amd64 + v1.20/debian:v1.20.1-debian-amd64-1.0,v1.20-debian-amd64-1,v1.20.1-debian-amd64,edge-debian-amd64 # :,,,... # Define images for running on ARM platforms ARM_IMAGES := \ - v1.20/armhf/debian:v1.20.0-debian-armhf-1.0,v1.20-debian-armhf-1,v1.20.0-debian-armhf,edge-debian-armhf + v1.20/armhf/debian:v1.20.1-debian-armhf-1.0,v1.20-debian-armhf-1,v1.20.1-debian-armhf,edge-debian-armhf # Define images for running on ARM64 platforms ARM64_IMAGES := \ - v1.20/arm64/debian:v1.20.0-debian-arm64-1.0,v1.20-debian-arm64-1,v1.20.0-debian-arm64,edge-debian-arm64 + v1.20/arm64/debian:v1.20.1-debian-arm64-1.0,v1.20-debian-arm64-1,v1.20.1-debian-arm64,edge-debian-arm64 WINDOWS_IMAGES := \ - v1.20/windows-ltsc2019:v1.20.0-windows-ltsc2019-1.0,v1.20-windows-ltsc2019-1 \ - v1.20/windows-ltsc2022:v1.20.0-windows-ltsc2022-1.0,v1.20-windows-ltsc2022-1 + v1.20/windows-ltsc2019:v1.20.1-windows-ltsc2019-1.0,v1.20-windows-ltsc2019-1 \ + v1.20/windows-ltsc2022:v1.20.1-windows-ltsc2022-1.0,v1.20-windows-ltsc2022-1 LINUX_IMAGES := $(X86_IMAGES) $(ARM_IMAGES) $(ARM64_IMAGES) ALL_IMAGES := $(LINUX_IMAGES) $(WINDOWS_IMAGES) diff --git a/README.md b/README.md index 3a610a01..71d6de7d 100644 --- a/README.md +++ b/README.md @@ -22,19 +22,19 @@ These tags have image version postfix. This updates many places so we need feedb Current images use fluentd v1 series. -- `v1.20.0-1.0`, `v1.20-1`, `edge`, `latest` +- `v1.20.1-1.0`, `v1.20-1`, `edge`, `latest` [(v1.20/debian/Dockerfile)][fluentd-1-debian] (Since v1.19.0, alpine image will not be shipped anymore.) -- `v1.20.0-debian-1.0`, `v1.20-debian-1`, `edge-debian` +- `v1.20.1-debian-1.0`, `v1.20-debian-1`, `edge-debian` (multiarch image for arm64(AArch64), armhf and amd64(x86_64)) -- `v1.20.0-debian-amd64-1.0`, `v1.20-debian-amd64-1`, `edge-debian-amd64` +- `v1.20.1-debian-amd64-1.0`, `v1.20-debian-amd64-1`, `edge-debian-amd64` [(v1.20/debian/Dockerfile)][fluentd-1-debian] -- `v1.20.0-debian-arm64-1.0`, `v1.20-debian-arm64-1`, `edge-debian-arm64` +- `v1.20.1-debian-arm64-1.0`, `v1.20-debian-arm64-1`, `edge-debian-arm64` [(v1.20/arm64/debian/Dockerfile)][fluentd-1-debian-arm64] -- `v1.20.0-debian-armhf-1.0`, `v1.20-debian-armhf-1`, `edge-debian-armhf` +- `v1.20.1-debian-armhf-1.0`, `v1.20-debian-armhf-1`, `edge-debian-armhf` [(v1.20/armhf/debian/Dockerfile)][fluentd-1-debian-armhf] -- `v1.20.0-windows-ltsc2019-1.0`, `v1.20-windows-ltsc2019-1` +- `v1.20.1-windows-ltsc2019-1.0`, `v1.20-windows-ltsc2019-1` [(v1.20/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows] -- `v1.20.0-windows-ltsc2022-1.0`, `v1.20-windows-ltsc2022-1` +- `v1.20.1-windows-ltsc2022-1.0`, `v1.20-windows-ltsc2022-1` [(v1.20/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows] > [!TIP] From 8ef63184b72e4334756ef12fab626816f5da32a1 Mon Sep 17 00:00:00 2001 From: Shizuo Fujita Date: Mon, 26 Oct 2026 12:32:38 +0900 Subject: [PATCH 3/3] Add v1.20.1 images Co-Authored-By: Claude Opus 5.5 Signed-off-by: Shizuo Fujita --- v1.20/arm64/debian/Dockerfile | 5 +++-- v1.20/armhf/debian/Dockerfile | 5 +++-- v1.20/debian/Dockerfile | 5 +++-- v1.20/windows-ltsc2019/Dockerfile | 5 +++-- v1.20/windows-ltsc2022/Dockerfile | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/v1.20/arm64/debian/Dockerfile b/v1.20/arm64/debian/Dockerfile index 36bc60fc..31bdb035 100644 --- a/v1.20/arm64/debian/Dockerfile +++ b/v1.20/arm64/debian/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=linux/arm64 arm64v8/ruby:3.4-slim LABEL maintainer "Fluentd developers " -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.20.0" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.20.1" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -23,7 +23,8 @@ RUN apt-get update \ && gem install rexml -v 3.4.4 \ && gem install async -v 2.24.0 \ && gem install async-http -v 0.89.0 \ - && gem install fluentd -v 1.20.0 \ + && gem install yajl-ruby -v 1.4.3 \ + && gem install fluentd -v 1.20.1 \ && unset MAKEFLAGS \ && export GEM_DIR=$(ruby -e 'puts Gem.dir') \ && echo GEM_DIR=$GEM_DIR \ diff --git a/v1.20/armhf/debian/Dockerfile b/v1.20/armhf/debian/Dockerfile index c72f998d..14ec45e4 100644 --- a/v1.20/armhf/debian/Dockerfile +++ b/v1.20/armhf/debian/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=linux/arm/v7 arm32v7/ruby:3.4-slim LABEL maintainer "Fluentd developers " -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.20.0" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.20.1" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -23,7 +23,8 @@ RUN apt-get update \ && gem install rexml -v 3.4.4 \ && gem install async -v 2.24.0 \ && gem install async-http -v 0.89.0 \ - && gem install fluentd -v 1.20.0 \ + && gem install yajl-ruby -v 1.4.3 \ + && gem install fluentd -v 1.20.1 \ && unset MAKEFLAGS \ && export GEM_DIR=$(ruby -e 'puts Gem.dir') \ && echo GEM_DIR=$GEM_DIR \ diff --git a/v1.20/debian/Dockerfile b/v1.20/debian/Dockerfile index c214d92c..69cca628 100644 --- a/v1.20/debian/Dockerfile +++ b/v1.20/debian/Dockerfile @@ -3,7 +3,7 @@ FROM ruby:3.4-slim LABEL maintainer "Fluentd developers " -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.20.0" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.20.1" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -23,7 +23,8 @@ RUN apt-get update \ && gem install rexml -v 3.4.4 \ && gem install async -v 2.24.0 \ && gem install async-http -v 0.89.0 \ - && gem install fluentd -v 1.20.0 \ + && gem install yajl-ruby -v 1.4.3 \ + && gem install fluentd -v 1.20.1 \ && unset MAKEFLAGS \ && export GEM_DIR=$(ruby -e 'puts Gem.dir') \ && echo GEM_DIR=$GEM_DIR \ diff --git a/v1.20/windows-ltsc2019/Dockerfile b/v1.20/windows-ltsc2019/Dockerfile index 54f30fb2..e2d787b7 100644 --- a/v1.20/windows-ltsc2019/Dockerfile +++ b/v1.20/windows-ltsc2019/Dockerfile @@ -3,7 +3,7 @@ FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019 LABEL maintainer "Fluentd developers " -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.20.0" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.20.1" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -19,7 +19,8 @@ RUN refreshenv \ && gem install oj -v 3.17.3 \ && gem install json -v 2.19.9 \ && gem install rexml -v 3.4.4 \ -&& gem install fluentd -v 1.20.0 \ +&& gem install yajl-ruby -v 1.4.3 \ +&& gem install fluentd -v 1.20.1 \ && gem install win32-service -v 2.3.2 \ && gem install win32-ipc -v 0.7.0 \ && gem install win32-event -v 0.6.3 \ diff --git a/v1.20/windows-ltsc2022/Dockerfile b/v1.20/windows-ltsc2022/Dockerfile index 8a7b3d35..828caa16 100644 --- a/v1.20/windows-ltsc2022/Dockerfile +++ b/v1.20/windows-ltsc2022/Dockerfile @@ -3,7 +3,7 @@ FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022 LABEL maintainer "Fluentd developers " -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.20.0" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.20.1" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -19,7 +19,8 @@ RUN refreshenv \ && gem install oj -v 3.17.3 \ && gem install json -v 2.19.9 \ && gem install rexml -v 3.4.4 \ -&& gem install fluentd -v 1.20.0 \ +&& gem install yajl-ruby -v 1.4.3 \ +&& gem install fluentd -v 1.20.1 \ && gem install win32-service -v 2.3.2 \ && gem install win32-ipc -v 0.7.0 \ && gem install win32-event -v 0.6.3 \