diff --git a/Dockerfile.template.erb b/Dockerfile.template.erb index b2b14256..2b7be45f 100644 --- a/Dockerfile.template.erb +++ b/Dockerfile.template.erb @@ -63,7 +63,7 @@ RUN refreshenv \ && type "c:\ProgramData\gemrc" \ && gem install oj -v 3.16.11 \ && gem install json -v 2.13.2 \ -&& gem install rexml -v 3.4.1 \ +&& gem install rexml -v 3.4.4 \ && gem install fluentd -v <%= fluentd_ver %> \ && gem install win32-service -v 2.3.2 \ && gem install win32-ipc -v 0.7.0 \ @@ -100,7 +100,7 @@ RUN apt-get update \ && export MAKEFLAGS=-j$(nproc) \ && gem install oj -v 3.16.11 \ && gem install json -v 2.13.2 \ - && gem install rexml -v 3.4.1 \ + && 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 <%= fluentd_ver %> \ diff --git a/Makefile b/Makefile index 2e66653a..da6120d3 100644 --- a/Makefile +++ b/Makefile @@ -17,19 +17,19 @@ IMAGE_NAME := fluent/fluentd X86_IMAGES := \ - v1.19/debian:v1.19.1-debian-amd64-2.0,v1.19-debian-amd64-2,v1.19.1-debian-amd64,edge-debian-amd64 + v1.19/debian:v1.19.1-debian-amd64-2.1,v1.19-debian-amd64-2,v1.19.1-debian-amd64,edge-debian-amd64 # :,,,... # Define images for running on ARM platforms ARM_IMAGES := \ - v1.19/armhf/debian:v1.19.1-debian-armhf-2.0,v1.19-debian-armhf-2,v1.19.1-debian-armhf,edge-debian-armhf + v1.19/armhf/debian:v1.19.1-debian-armhf-2.1,v1.19-debian-armhf-2,v1.19.1-debian-armhf,edge-debian-armhf # Define images for running on ARM64 platforms ARM64_IMAGES := \ - v1.19/arm64/debian:v1.19.1-debian-arm64-2.0,v1.19-debian-arm64-2,v1.19.1-debian-arm64,edge-debian-arm64 + v1.19/arm64/debian:v1.19.1-debian-arm64-2.1,v1.19-debian-arm64-2,v1.19.1-debian-arm64,edge-debian-arm64 WINDOWS_IMAGES := \ - v1.19/windows-ltsc2019:v1.19.1-windows-ltsc2019-1.0,v1.19-windows-ltsc2019-1 \ - v1.19/windows-ltsc2022:v1.19.1-windows-ltsc2022-1.0,v1.19-windows-ltsc2022-1 + v1.19/windows-ltsc2019:v1.19.1-windows-ltsc2019-1.1,v1.19-windows-ltsc2019-1 \ + v1.19/windows-ltsc2022:v1.19.1-windows-ltsc2022-1.1,v1.19-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 46fbded2..fe880ab2 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.19.1-2.0`, `v1.19-2`, `edge`, `latest` +- `v1.19.1-2.1`, `v1.19-2`, `edge`, `latest` [(v1.19/debian/Dockerfile)][fluentd-1-debian] (Since v1.19.0, alpine image will not be shipped anymore.) -- `v1.19.1-debian-2.0`, `v1.19-debian-2`, `edge-debian` +- `v1.19.1-debian-2.1`, `v1.19-debian-2`, `edge-debian` (multiarch image for arm64(AArch64), armhf and amd64(x86_64)) -- `v1.19.1-debian-amd64-2.0`, `v1.19-debian-amd64-2`, `edge-debian-amd64` +- `v1.19.1-debian-amd64-2.1`, `v1.19-debian-amd64-2`, `edge-debian-amd64` [(v1.19/debian/Dockerfile)][fluentd-1-debian] -- `v1.19.1-debian-arm64-2.0`, `v1.19-debian-arm64-2`, `edge-debian-arm64` +- `v1.19.1-debian-arm64-2.1`, `v1.19-debian-arm64-2`, `edge-debian-arm64` [(v1.19/arm64/debian/Dockerfile)][fluentd-1-debian-arm64] -- `v1.19.1-debian-armhf-2.0`, `v1.19-debian-armhf-2`, `edge-debian-armhf` +- `v1.19.1-debian-armhf-2.1`, `v1.19-debian-armhf-2`, `edge-debian-armhf` [(v1.19/armhf/debian/Dockerfile)][fluentd-1-debian-armhf] -- `v1.19.1-windows-ltsc2019-1.0`, `v1.19-windows-ltsc2019-1` +- `v1.19.1-windows-ltsc2019-1.1`, `v1.19-windows-ltsc2019-1` [(v1.19/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows] -- `v1.19.1-windows-ltsc2022-1.0`, `v1.19-windows-ltsc2022-1` +- `v1.19.1-windows-ltsc2022-1.1`, `v1.19-windows-ltsc2022-1` [(v1.19/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows] > [!TIP] diff --git a/v1.19/arm64/debian/Dockerfile b/v1.19/arm64/debian/Dockerfile index 3fff8a62..0e26a81b 100644 --- a/v1.19/arm64/debian/Dockerfile +++ b/v1.19/arm64/debian/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update \ && export MAKEFLAGS=-j$(nproc) \ && gem install oj -v 3.16.11 \ && gem install json -v 2.13.2 \ - && gem install rexml -v 3.4.1 \ + && 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.19.1 \ diff --git a/v1.19/armhf/debian/Dockerfile b/v1.19/armhf/debian/Dockerfile index f965805e..fec991be 100644 --- a/v1.19/armhf/debian/Dockerfile +++ b/v1.19/armhf/debian/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update \ && export MAKEFLAGS=-j$(nproc) \ && gem install oj -v 3.16.11 \ && gem install json -v 2.13.2 \ - && gem install rexml -v 3.4.1 \ + && 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.19.1 \ diff --git a/v1.19/debian/Dockerfile b/v1.19/debian/Dockerfile index c319b315..bff1e375 100644 --- a/v1.19/debian/Dockerfile +++ b/v1.19/debian/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update \ && export MAKEFLAGS=-j$(nproc) \ && gem install oj -v 3.16.11 \ && gem install json -v 2.13.2 \ - && gem install rexml -v 3.4.1 \ + && 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.19.1 \ diff --git a/v1.19/windows-ltsc2019/Dockerfile b/v1.19/windows-ltsc2019/Dockerfile index c7baa3e6..0f46ad3b 100644 --- a/v1.19/windows-ltsc2019/Dockerfile +++ b/v1.19/windows-ltsc2019/Dockerfile @@ -19,7 +19,7 @@ RUN refreshenv \ && type "c:\ProgramData\gemrc" \ && gem install oj -v 3.16.11 \ && gem install json -v 2.13.2 \ -&& gem install rexml -v 3.4.1 \ +&& gem install rexml -v 3.4.4 \ && gem install fluentd -v 1.19.1 \ && gem install win32-service -v 2.3.2 \ && gem install win32-ipc -v 0.7.0 \ diff --git a/v1.19/windows-ltsc2022/Dockerfile b/v1.19/windows-ltsc2022/Dockerfile index f68ae790..1b3922e0 100644 --- a/v1.19/windows-ltsc2022/Dockerfile +++ b/v1.19/windows-ltsc2022/Dockerfile @@ -19,7 +19,7 @@ RUN refreshenv \ && type "c:\ProgramData\gemrc" \ && gem install oj -v 3.16.11 \ && gem install json -v 2.13.2 \ -&& gem install rexml -v 3.4.1 \ +&& gem install rexml -v 3.4.4 \ && gem install fluentd -v 1.19.1 \ && gem install win32-service -v 2.3.2 \ && gem install win32-ipc -v 0.7.0 \