diff --git a/Dockerfile.template.erb b/Dockerfile.template.erb index 695b6998..a692a064 100644 --- a/Dockerfile.template.erb +++ b/Dockerfile.template.erb @@ -18,7 +18,7 @@ FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-<%= window <% if is_armhf %> FROM resin/armhf-alpine:3.7 <% else %> -FROM alpine:3.19 +FROM alpine:3.20 <% end %> <% else %> <% if is_armhf %> @@ -29,7 +29,7 @@ ENV QEMU_DOWNLOAD_SHA256 47ae430b0e7c25e1bde290ac447a720e2ea6c6e78cd84e44847edda RUN apk add curl --no-cache RUN curl -sL -o qemu-3.0.0+resin-arm.tar.gz https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-3.0.0+resin-arm.tar.gz" | sha256sum -c - | tar zxvf qemu-3.0.0+resin-arm.tar.gz -C . && mv qemu-3.0.0+resin-arm/qemu-arm-static . -FROM --platform=linux/arm/v7 arm32v7/ruby:3.2-slim-bookworm +FROM --platform=linux/arm/v7 arm32v7/ruby:3.3-slim-bookworm COPY --from=builder /go/qemu-arm-static /usr/bin/ <% elsif is_arm64 %> # To set multiarch build for Docker hub automated build. @@ -39,10 +39,10 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM --platform=linux/arm64 arm64v8/ruby:3.2-slim-bookworm +FROM --platform=linux/arm64 arm64v8/ruby:3.3-slim-bookworm COPY --from=builder /go/qemu-aarch64-static /usr/bin/ <% else %> -FROM ruby:3.2-slim-bookworm +FROM ruby:3.3-slim-bookworm <% end %> <% end %> <% end %> @@ -73,14 +73,14 @@ ENV TINI_VERSION=0.18.0 RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://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.4.1 --params "'/InstallDir:C:\ruby32'" \ -&& choco install -y msys2 --version 20240507.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby32\msys64'" +RUN choco install -y ruby --version 3.3.4.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 \ && echo gem: --no-document >> C:\ProgramData\gemrc \ && gem install oj -v 3.16.5 \ && gem install json -v 2.7.2 \ -&& gem install rexml -v 3.3.5 \ +&& gem install rexml -v 3.3.7 \ && gem install fluentd -v <%= fluentd_ver %> \ && gem install win32-service -v 2.3.2 \ && gem install win32-ipc -v 0.7.0 \ @@ -88,7 +88,7 @@ RUN refreshenv \ && gem sources --clear-all # Remove gem cache and chocolatey -RUN powershell -Command "Remove-Item -Force C:\ruby32\lib\ruby\gems\3.2.0\cache\*.gem; Remove-Item -Recurse -Force 'C:\ProgramData\chocolatey'" +RUN powershell -Command "Remove-Item -Force C:\ruby32\lib\ruby\gems\3.3.0\cache\*.gem; Remove-Item -Recurse -Force 'C:\ProgramData\chocolatey'" COPY fluent.conf /fluent/conf/fluent.conf <% else %> diff --git a/test/suite.bats b/test/suite.bats index d9ebe7a7..d5712220 100755 --- a/test/suite.bats +++ b/test/suite.bats @@ -22,14 +22,14 @@ } -@test "ruby version is 3.2" { +@test "ruby version is 3.3" { run docker run --rm $IMAGE sh -c "ruby --version | cut -d ' ' -f 2" [ "$status" -eq 0 ] major=$(echo "$output" | cut -d '.' -f 1) minor=$(echo "$output" | cut -d '.' -f 2) [ "$major" -eq "3" ] - [[ "$minor" -eq "2" ]] + [[ "$minor" -eq "3" ]] } diff --git a/v1.17/alpine/Dockerfile b/v1.17/alpine/Dockerfile index ab417b16..60fb8b97 100644 --- a/v1.17/alpine/Dockerfile +++ b/v1.17/alpine/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb -FROM alpine:3.19 +FROM alpine:3.20 LABEL maintainer "Fluentd developers " LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1" diff --git a/v1.17/arm64/debian/Dockerfile b/v1.17/arm64/debian/Dockerfile index ed0b6bec..5b432536 100644 --- a/v1.17/arm64/debian/Dockerfile +++ b/v1.17/arm64/debian/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61 RUN apk add curl --no-cache RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static . -FROM --platform=linux/arm64 arm64v8/ruby:3.2-slim-bookworm +FROM --platform=linux/arm64 arm64v8/ruby:3.3-slim-bookworm COPY --from=builder /go/qemu-aarch64-static /usr/bin/ LABEL maintainer "Fluentd developers " LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1" diff --git a/v1.17/armhf/debian/Dockerfile b/v1.17/armhf/debian/Dockerfile index 6375ee8d..f1b0e2ef 100644 --- a/v1.17/armhf/debian/Dockerfile +++ b/v1.17/armhf/debian/Dockerfile @@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 47ae430b0e7c25e1bde290ac447a720e2ea6c6e78cd84e44847edda RUN apk add curl --no-cache RUN curl -sL -o qemu-3.0.0+resin-arm.tar.gz https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-3.0.0+resin-arm.tar.gz" | sha256sum -c - | tar zxvf qemu-3.0.0+resin-arm.tar.gz -C . && mv qemu-3.0.0+resin-arm/qemu-arm-static . -FROM --platform=linux/arm/v7 arm32v7/ruby:3.2-slim-bookworm +FROM --platform=linux/arm/v7 arm32v7/ruby:3.3-slim-bookworm COPY --from=builder /go/qemu-arm-static /usr/bin/ LABEL maintainer "Fluentd developers " LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1" diff --git a/v1.17/debian/Dockerfile b/v1.17/debian/Dockerfile index 4a245d11..470c32d4 100644 --- a/v1.17/debian/Dockerfile +++ b/v1.17/debian/Dockerfile @@ -1,7 +1,7 @@ # AUTOMATICALLY GENERATED # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb -FROM ruby:3.2-slim-bookworm +FROM ruby:3.3-slim-bookworm LABEL maintainer "Fluentd developers " LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1" ENV TINI_VERSION=0.18.0 diff --git a/v1.17/windows-ltsc2019/Dockerfile b/v1.17/windows-ltsc2019/Dockerfile index c6261d72..b2ba9924 100644 --- a/v1.17/windows-ltsc2019/Dockerfile +++ b/v1.17/windows-ltsc2019/Dockerfile @@ -10,14 +10,14 @@ LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1 RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://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.4.1 --params "'/InstallDir:C:\ruby32'" \ -&& choco install -y msys2 --version 20240507.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby32\msys64'" +RUN choco install -y ruby --version 3.3.4.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 \ && echo gem: --no-document >> C:\ProgramData\gemrc \ && gem install oj -v 3.16.5 \ && gem install json -v 2.7.2 \ -&& gem install rexml -v 3.3.5 \ +&& gem install rexml -v 3.3.7 \ && gem install fluentd -v 1.17.1 \ && gem install win32-service -v 2.3.2 \ && gem install win32-ipc -v 0.7.0 \ @@ -25,7 +25,7 @@ RUN refreshenv \ && gem sources --clear-all # Remove gem cache and chocolatey -RUN powershell -Command "Remove-Item -Force C:\ruby32\lib\ruby\gems\3.2.0\cache\*.gem; Remove-Item -Recurse -Force 'C:\ProgramData\chocolatey'" +RUN powershell -Command "Remove-Item -Force C:\ruby32\lib\ruby\gems\3.3.0\cache\*.gem; Remove-Item -Recurse -Force 'C:\ProgramData\chocolatey'" COPY fluent.conf /fluent/conf/fluent.conf diff --git a/v1.17/windows-ltsc2022/Dockerfile b/v1.17/windows-ltsc2022/Dockerfile index 54b0c68c..5d60d46e 100644 --- a/v1.17/windows-ltsc2022/Dockerfile +++ b/v1.17/windows-ltsc2022/Dockerfile @@ -10,14 +10,14 @@ LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1 RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://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.4.1 --params "'/InstallDir:C:\ruby32'" \ -&& choco install -y msys2 --version 20240507.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby32\msys64'" +RUN choco install -y ruby --version 3.3.4.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 \ && echo gem: --no-document >> C:\ProgramData\gemrc \ && gem install oj -v 3.16.5 \ && gem install json -v 2.7.2 \ -&& gem install rexml -v 3.3.5 \ +&& gem install rexml -v 3.3.7 \ && gem install fluentd -v 1.17.1 \ && gem install win32-service -v 2.3.2 \ && gem install win32-ipc -v 0.7.0 \ @@ -25,7 +25,7 @@ RUN refreshenv \ && gem sources --clear-all # Remove gem cache and chocolatey -RUN powershell -Command "Remove-Item -Force C:\ruby32\lib\ruby\gems\3.2.0\cache\*.gem; Remove-Item -Recurse -Force 'C:\ProgramData\chocolatey'" +RUN powershell -Command "Remove-Item -Force C:\ruby32\lib\ruby\gems\3.3.0\cache\*.gem; Remove-Item -Recurse -Force 'C:\ProgramData\chocolatey'" COPY fluent.conf /fluent/conf/fluent.conf