diff --git a/Dockerfile.template.erb b/Dockerfile.template.erb index 2a397747..4459b3b1 100644 --- a/Dockerfile.template.erb +++ b/Dockerfile.template.erb @@ -54,7 +54,7 @@ RUN [ ${CROSS_BUILD_START} ] RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))" # NOTE: For avoiding stalling with docker build on windows, we must use latest version of msys2. -RUN choco install -y ruby --version 3.2.6.1 --params "'/InstallDir:C:\ruby32'" \ +RUN choco install -y ruby --version 3.2.8.1 --params "'/InstallDir:C:\ruby32'" \ && choco install -y msys2 --version 20240727.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby32\msys64'" RUN refreshenv \ && ridk install 3 \ diff --git a/Makefile b/Makefile index 512ac38b..16f8d7b8 100644 --- a/Makefile +++ b/Makefile @@ -17,21 +17,21 @@ IMAGE_NAME := fluent/fluentd X86_IMAGES := \ - v1.18/alpine:v1.18.0-1.2,v1.18-1,edge \ - v1.18/debian:v1.18.0-debian-amd64-1.2,v1.18-debian-amd64-1,v1.18.0-debian-amd64,edge-debian-amd64 + v1.18/alpine:v1.18.0-1.3,v1.18-1,edge \ + v1.18/debian:v1.18.0-debian-amd64-1.3,v1.18-debian-amd64-1,v1.18.0-debian-amd64,edge-debian-amd64 # :,,,... # Define images for running on ARM platforms ARM_IMAGES := \ - v1.18/armhf/debian:v1.18.0-debian-armhf-1.2,v1.18-debian-armhf-1,v1.18.0-debian-armhf,edge-debian-armhf \ + v1.18/armhf/debian:v1.18.0-debian-armhf-1.3,v1.18-debian-armhf-1,v1.18.0-debian-armhf,edge-debian-armhf \ # Define images for running on ARM64 platforms ARM64_IMAGES := \ - v1.18/arm64/debian:v1.18.0-debian-arm64-1.2,v1.18-debian-arm64-1,v1.18.0-debian-arm64,edge-debian-arm64 \ + v1.18/arm64/debian:v1.18.0-debian-arm64-1.3,v1.18-debian-arm64-1,v1.18.0-debian-arm64,edge-debian-arm64 \ WINDOWS_IMAGES := \ - v1.18/windows-ltsc2019:v1.18.0-windows-ltsc2019-1.2,v1.18-windows-ltsc2019-1 \ - v1.18/windows-ltsc2022:v1.18.0-windows-ltsc2022-1.2,v1.18-windows-ltsc2022-1 + v1.18/windows-ltsc2019:v1.18.0-windows-ltsc2019-1.3,v1.18-windows-ltsc2019-1 \ + v1.18/windows-ltsc2022:v1.18.0-windows-ltsc2022-1.3,v1.18-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 cb9f7cad..3116d432 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.18.0-1.0`, `v1.18-1`, `edge` +- `v1.18.0-1.3`, `v1.18-1`, `edge` [(v1.18/alpine/Dockerfile)][fluentd-1-alpine] (Deprecated) -- `v1.18.0-debian-1.0`, `v1.18-debian-1`, `edge-debian` +- `v1.18.0-debian-1.3`, `v1.18-debian-1`, `edge-debian` (multiarch image for arm64(AArch64) and amd64(x86_64)) -- `v1.18.0-debian-amd64-1.0`, `v1.18-debian-amd64-1`, `edge-debian-amd64` +- `v1.18.0-debian-amd64-1.3`, `v1.18-debian-amd64-1`, `edge-debian-amd64` [(v1.18/debian/Dockerfile)][fluentd-1-debian] -- `v1.18.0-debian-arm64-1.0`, `v1.18-debian-arm64-1`, `edge-debian-arm64` +- `v1.18.0-debian-arm64-1.3`, `v1.18-debian-arm64-1`, `edge-debian-arm64` [(v1.18/arm64/debian/Dockerfile)][fluentd-1-debian-arm64] -- `v1.18.0-debian-armhf-1.0`, `v1.18-debian-armhf-1`, `edge-debian-armhf` +- `v1.18.0-debian-armhf-1.3`, `v1.18-debian-armhf-1`, `edge-debian-armhf` [(v1.18/armhf/debian/Dockerfile)][fluentd-1-debian-armhf] -- `v1.18.0-windows-ltsc2019-1.0`, `v1.18-windows-ltsc2019-1` +- `v1.18.0-windows-ltsc2019-1.3`, `v1.18-windows-ltsc2019-1` [(v1.18/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows] -- `v1.18.0-windows-ltsc2022-1.0`, `v1.18-windows-ltsc2022-1` +- `v1.18.0-windows-ltsc2022-1.3`, `v1.18-windows-ltsc2022-1` [(v1.18/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows] > [!TIP] diff --git a/v1.18/windows-ltsc2019/Dockerfile b/v1.18/windows-ltsc2019/Dockerfile index 34150c43..16cb943b 100644 --- a/v1.18/windows-ltsc2019/Dockerfile +++ b/v1.18/windows-ltsc2019/Dockerfile @@ -10,7 +10,7 @@ LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1 RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))" # NOTE: For avoiding stalling with docker build on windows, we must use latest version of msys2. -RUN choco install -y ruby --version 3.2.6.1 --params "'/InstallDir:C:\ruby32'" \ +RUN choco install -y ruby --version 3.2.8.1 --params "'/InstallDir:C:\ruby32'" \ && choco install -y msys2 --version 20240727.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby32\msys64'" RUN refreshenv \ && ridk install 3 \ diff --git a/v1.18/windows-ltsc2022/Dockerfile b/v1.18/windows-ltsc2022/Dockerfile index f3beb8c3..fed80e48 100644 --- a/v1.18/windows-ltsc2022/Dockerfile +++ b/v1.18/windows-ltsc2022/Dockerfile @@ -10,7 +10,7 @@ LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1 RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))" # NOTE: For avoiding stalling with docker build on windows, we must use latest version of msys2. -RUN choco install -y ruby --version 3.2.6.1 --params "'/InstallDir:C:\ruby32'" \ +RUN choco install -y ruby --version 3.2.8.1 --params "'/InstallDir:C:\ruby32'" \ && choco install -y msys2 --version 20240727.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby32\msys64'" RUN refreshenv \ && ridk install 3 \