From a6f1cf890c8d6f087b5b9e604348cbee4bbaf2f2 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Mon, 21 Sep 2026 16:50:34 +0900 Subject: [PATCH 1/3] Update to json 2.19.9 (CVE-2026-54696) Signed-off-by: Kentaro Hayashi --- Dockerfile.template.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.template.erb b/Dockerfile.template.erb index 92ad8952..866c0241 100644 --- a/Dockerfile.template.erb +++ b/Dockerfile.template.erb @@ -52,7 +52,7 @@ RUN refreshenv \ && c:\ruby34\bin\ruby -r yaml -e "path = 'c:/ProgramData/gemrc'; yaml = YAML.safe_load(File.read(path)); yaml['install'] = '--no-document'; yaml['update'] = '--no-document'; File.write(path, YAML.dump(yaml))" \ && type "c:\ProgramData\gemrc" \ && gem install oj -v 3.17.3 \ -&& gem install json -v 2.13.2 \ +&& gem install json -v 2.19.9 \ && gem install rexml -v 3.4.4 \ && gem install fluentd -v <%= fluentd_ver %> \ && gem install win32-service -v 2.3.2 \ @@ -77,7 +77,7 @@ RUN apt-get update \ && echo 'gem: --no-document' >> /etc/gemrc \ && export MAKEFLAGS=-j$(nproc) \ && gem install oj -v 3.17.3 \ - && gem install json -v 2.13.2 \ + && gem install json -v 2.19.9 \ && gem install rexml -v 3.4.4 \ && gem install async -v 2.24.0 \ && gem install async-http -v 0.89.0 \ From 73ac3771f090fd17b39b4df43fb3d1afe5093c17 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Mon, 21 Sep 2026 16:53:32 +0900 Subject: [PATCH 2/3] Bump versions * linux: -2.4 * windows: -1.2 Signed-off-by: Kentaro Hayashi --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 30f5686a..2795fed3 100644 --- a/Makefile +++ b/Makefile @@ -17,19 +17,19 @@ IMAGE_NAME := fluent/fluentd X86_IMAGES := \ - v1.19/debian:v1.19.3-debian-amd64-2.3,v1.19-debian-amd64-2,v1.19.3-debian-amd64,edge-debian-amd64 + v1.19/debian:v1.19.3-debian-amd64-2.4,v1.19-debian-amd64-2,v1.19.3-debian-amd64,edge-debian-amd64 # :,,,... # Define images for running on ARM platforms ARM_IMAGES := \ - v1.19/armhf/debian:v1.19.3-debian-armhf-2.3,v1.19-debian-armhf-2,v1.19.3-debian-armhf,edge-debian-armhf + v1.19/armhf/debian:v1.19.3-debian-armhf-2.4,v1.19-debian-armhf-2,v1.19.3-debian-armhf,edge-debian-armhf # Define images for running on ARM64 platforms ARM64_IMAGES := \ - v1.19/arm64/debian:v1.19.3-debian-arm64-2.3,v1.19-debian-arm64-2,v1.19.3-debian-arm64,edge-debian-arm64 + v1.19/arm64/debian:v1.19.3-debian-arm64-2.4,v1.19-debian-arm64-2,v1.19.3-debian-arm64,edge-debian-arm64 WINDOWS_IMAGES := \ - v1.19/windows-ltsc2019:v1.19.3-windows-ltsc2019-1.1,v1.19-windows-ltsc2019-1 \ - v1.19/windows-ltsc2022:v1.19.3-windows-ltsc2022-1.1,v1.19-windows-ltsc2022-1 + v1.19/windows-ltsc2019:v1.19.3-windows-ltsc2019-1.2,v1.19-windows-ltsc2019-1 \ + v1.19/windows-ltsc2022:v1.19.3-windows-ltsc2022-1.2,v1.19-windows-ltsc2022-1 LINUX_IMAGES := $(X86_IMAGES) $(ARM_IMAGES) $(ARM64_IMAGES) ALL_IMAGES := $(LINUX_IMAGES) $(WINDOWS_IMAGES) From 0b7e4322b5688e02002a51b6fabdf06e23f71f86 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Mon, 21 Sep 2026 16:53:59 +0900 Subject: [PATCH 3/3] Update images Signed-off-by: Kentaro Hayashi --- v1.19/arm64/debian/Dockerfile | 2 +- v1.19/armhf/debian/Dockerfile | 2 +- v1.19/debian/Dockerfile | 2 +- v1.19/windows-ltsc2019/Dockerfile | 2 +- v1.19/windows-ltsc2022/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/v1.19/arm64/debian/Dockerfile b/v1.19/arm64/debian/Dockerfile index d208245f..f70f61b5 100644 --- a/v1.19/arm64/debian/Dockerfile +++ b/v1.19/arm64/debian/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ && echo 'gem: --no-document' >> /etc/gemrc \ && export MAKEFLAGS=-j$(nproc) \ && gem install oj -v 3.17.3 \ - && gem install json -v 2.13.2 \ + && gem install json -v 2.19.9 \ && gem install rexml -v 3.4.4 \ && gem install async -v 2.24.0 \ && gem install async-http -v 0.89.0 \ diff --git a/v1.19/armhf/debian/Dockerfile b/v1.19/armhf/debian/Dockerfile index e105dafa..bb47ff82 100644 --- a/v1.19/armhf/debian/Dockerfile +++ b/v1.19/armhf/debian/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update \ && echo 'gem: --no-document' >> /etc/gemrc \ && export MAKEFLAGS=-j$(nproc) \ && gem install oj -v 3.17.3 \ - && gem install json -v 2.13.2 \ + && gem install json -v 2.19.9 \ && gem install rexml -v 3.4.4 \ && gem install async -v 2.24.0 \ && gem install async-http -v 0.89.0 \ diff --git a/v1.19/debian/Dockerfile b/v1.19/debian/Dockerfile index 51e7fd86..e5c0f43c 100644 --- a/v1.19/debian/Dockerfile +++ b/v1.19/debian/Dockerfile @@ -19,7 +19,7 @@ RUN apt-get update \ && echo 'gem: --no-document' >> /etc/gemrc \ && export MAKEFLAGS=-j$(nproc) \ && gem install oj -v 3.17.3 \ - && gem install json -v 2.13.2 \ + && gem install json -v 2.19.9 \ && gem install rexml -v 3.4.4 \ && gem install async -v 2.24.0 \ && gem install async-http -v 0.89.0 \ diff --git a/v1.19/windows-ltsc2019/Dockerfile b/v1.19/windows-ltsc2019/Dockerfile index 6ad76eaa..4429816e 100644 --- a/v1.19/windows-ltsc2019/Dockerfile +++ b/v1.19/windows-ltsc2019/Dockerfile @@ -17,7 +17,7 @@ RUN refreshenv \ && c:\ruby34\bin\ruby -r yaml -e "path = 'c:/ProgramData/gemrc'; yaml = YAML.safe_load(File.read(path)); yaml['install'] = '--no-document'; yaml['update'] = '--no-document'; File.write(path, YAML.dump(yaml))" \ && type "c:\ProgramData\gemrc" \ && gem install oj -v 3.17.3 \ -&& gem install json -v 2.13.2 \ +&& gem install json -v 2.19.9 \ && gem install rexml -v 3.4.4 \ && gem install fluentd -v 1.19.3 \ && gem install win32-service -v 2.3.2 \ diff --git a/v1.19/windows-ltsc2022/Dockerfile b/v1.19/windows-ltsc2022/Dockerfile index 3eb18496..687132b1 100644 --- a/v1.19/windows-ltsc2022/Dockerfile +++ b/v1.19/windows-ltsc2022/Dockerfile @@ -17,7 +17,7 @@ RUN refreshenv \ && c:\ruby34\bin\ruby -r yaml -e "path = 'c:/ProgramData/gemrc'; yaml = YAML.safe_load(File.read(path)); yaml['install'] = '--no-document'; yaml['update'] = '--no-document'; File.write(path, YAML.dump(yaml))" \ && type "c:\ProgramData\gemrc" \ && gem install oj -v 3.17.3 \ -&& gem install json -v 2.13.2 \ +&& gem install json -v 2.19.9 \ && gem install rexml -v 3.4.4 \ && gem install fluentd -v 1.19.3 \ && gem install win32-service -v 2.3.2 \