From 90f03cc523b21524f54b373ae87838eef82c4887 Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Thu, 28 Mar 2024 10:01:36 +0900 Subject: [PATCH 1/3] Bump up version to v1.16.5 Signed-off-by: Takuro Ashie --- Makefile | 12 ++++++------ README.md | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 0208d02..d32e34e 100644 --- a/Makefile +++ b/Makefile @@ -17,21 +17,21 @@ IMAGE_NAME := fluent/fluentd X86_IMAGES := \ - v1.16/alpine:v1.16.4-1.0,v1.16-2,edge \ - v1.16/debian:v1.16.4-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64 + v1.16/alpine:v1.16.5-1.0,v1.16-2,edge \ + v1.16/debian:v1.16.5-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64 # :,,,... # Define images for running on ARM platforms ARM_IMAGES := \ - v1.16/armhf/debian:v1.16.4-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf \ + v1.16/armhf/debian:v1.16.5-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf \ # Define images for running on ARM64 platforms ARM64_IMAGES := \ - v1.16/arm64/debian:v1.16.4-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64 \ + v1.16/arm64/debian:v1.16.5-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64 \ WINDOWS_IMAGES := \ - v1.16/windows-ltsc2019:v1.16.4-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1 \ - v1.16/windows-ltsc2022:v1.16.4-windows-ltsc2022-1.0,v1.16-windows-ltsc2022-1 + v1.16/windows-ltsc2019:v1.16.5-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1 \ + v1.16/windows-ltsc2022:v1.16.5-windows-ltsc2022-1.0,v1.16-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 e39174c..2cf4891 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.16.4-1.0`, `v1.16-2`, `edge` +- `v1.16.5-1.0`, `v1.16-2`, `edge` [(v1.16/alpine/Dockerfile)][fluentd-1-alpine] -- `v1.16.4-debian-1.0`, `v1.16-debian-2`, `edge-debian` +- `v1.16.5-debian-1.0`, `v1.16-debian-2`, `edge-debian` (multiarch image for arm64(AArch64) and amd64(x86_64)) -- `v1.16.4-debian-amd64-1.0`, `v1.16-debian-amd64-2`, `edge-debian-amd64` +- `v1.16.5-debian-amd64-1.0`, `v1.16-debian-amd64-2`, `edge-debian-amd64` [(v1.16/debian/Dockerfile)][fluentd-1-debian] -- `v1.16.4-debian-arm64-1.0`, `v1.16-debian-arm64-2`, `edge-debian-arm64` +- `v1.16.5-debian-arm64-1.0`, `v1.16-debian-arm64-2`, `edge-debian-arm64` [(v1.16/arm64/debian/Dockerfile)][fluentd-1-debian-arm64] -- `v1.16.4-debian-armhf-1.0`, `v1.16-debian-armhf-2`, `edge-debian-armhf` +- `v1.16.5-debian-armhf-1.0`, `v1.16-debian-armhf-2`, `edge-debian-armhf` [(v1.16/armhf/debian/Dockerfile)][fluentd-1-debian-armhf] -- `v1.16.4-windows-ltsc2019-1.0`, `v1.16-windows-ltsc2019-1` +- `v1.16.5-windows-ltsc2019-1.0`, `v1.16-windows-ltsc2019-1` [(v1.16/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows] -- `v1.16.4-windows-ltsc2022-1.0`, `v1.16-windows-ltsc2022-1` +- `v1.16.5-windows-ltsc2022-1.0`, `v1.16-windows-ltsc2022-1` [(v1.16/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows] ### Old v1.4 images From 75c7c6dc5ba72a5cf685ccccfafb3723e55ca5aa Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Thu, 28 Mar 2024 10:08:41 +0900 Subject: [PATCH 2/3] Upgrade msys2 to 20240113.0.0 Signed-off-by: Takuro Ashie --- Dockerfile.template.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.template.erb b/Dockerfile.template.erb index bdf14b4..5691658 100644 --- a/Dockerfile.template.erb +++ b/Dockerfile.template.erb @@ -74,7 +74,7 @@ RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ( # NOTE: For avoiding stalling with docker build on windows, we must use latest version of msys2. RUN choco install -y ruby --version 3.1.3.1 --params "'/InstallDir:C:\ruby31'" \ -&& choco install -y msys2 --version 20231026.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby31\msys64'" +&& choco install -y msys2 --version 20240113.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby31\msys64'" RUN refreshenv \ && ridk install 3 \ && echo gem: --no-document >> C:\ProgramData\gemrc \ From e0a125aad8dd64d94f7a7a3214db244c93699f7c Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Thu, 28 Mar 2024 10:10:07 +0900 Subject: [PATCH 3/3] Add v1.16.5 images Signed-off-by: Takuro Ashie --- v1.16/alpine/Dockerfile | 4 ++-- v1.16/alpine/hooks/post_push | 2 +- v1.16/arm64/debian/Dockerfile | 4 ++-- v1.16/arm64/debian/hooks/post_push | 2 +- v1.16/armhf/debian/Dockerfile | 4 ++-- v1.16/armhf/debian/hooks/post_push | 2 +- v1.16/debian/Dockerfile | 4 ++-- v1.16/debian/hooks/post_push | 2 +- v1.16/windows-ltsc2019/Dockerfile | 6 +++--- v1.16/windows-ltsc2019/hooks/post_push | 2 +- v1.16/windows-ltsc2022/Dockerfile | 6 +++--- v1.16/windows-ltsc2022/hooks/post_push | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/v1.16/alpine/Dockerfile b/v1.16/alpine/Dockerfile index 118d020..5c12346 100644 --- a/v1.16/alpine/Dockerfile +++ b/v1.16/alpine/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.19 LABEL maintainer "Fluentd developers " -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.4" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.5" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -22,7 +22,7 @@ RUN apk update \ && gem install rexml -v 3.2.6 \ && gem install async -v 1.31.0 \ && gem install async-http -v 0.60.2 \ - && gem install fluentd -v 1.16.4 \ + && gem install fluentd -v 1.16.5 \ && gem install bigdecimal -v 1.4.4 \ && apk del .build-deps \ && rm -rf /var/cache/apk/* \ diff --git a/v1.16/alpine/hooks/post_push b/v1.16/alpine/hooks/post_push index 7e04eaa..2159c6d 100644 --- a/v1.16/alpine/hooks/post_push +++ b/v1.16/alpine/hooks/post_push @@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :) repoName=${IMAGE_NAME:0:tagStart-1} # Tag and push image for each additional tag -for tag in {v1.16.4-1.0,v1.16-2,edge}; do +for tag in {v1.16.5-1.0,v1.16-2,edge}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} diff --git a/v1.16/arm64/debian/Dockerfile b/v1.16/arm64/debian/Dockerfile index 4a2685c..5dd4b8b 100644 --- a/v1.16/arm64/debian/Dockerfile +++ b/v1.16/arm64/debian/Dockerfile @@ -11,7 +11,7 @@ RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/q FROM --platform=linux/arm64 arm64v8/ruby:3.2-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.16.4" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.5" ARG CROSS_BUILD_START="cross-build-start" ARG CROSS_BUILD_END="cross-build-end" RUN [ ${CROSS_BUILD_START} ] @@ -34,7 +34,7 @@ RUN apt-get update \ && gem install rexml -v 3.2.6 \ && gem install async -v 1.31.0 \ && gem install async-http -v 0.60.2 \ - && gem install fluentd -v 1.16.4 \ + && gem install fluentd -v 1.16.5 \ && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \ diff --git a/v1.16/arm64/debian/hooks/post_push b/v1.16/arm64/debian/hooks/post_push index f5b72da..295325b 100644 --- a/v1.16/arm64/debian/hooks/post_push +++ b/v1.16/arm64/debian/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image for each additional tag -for tag in {v1.16.4-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64}; do +for tag in {v1.16.5-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} diff --git a/v1.16/armhf/debian/Dockerfile b/v1.16/armhf/debian/Dockerfile index 2376b61..3487373 100644 --- a/v1.16/armhf/debian/Dockerfile +++ b/v1.16/armhf/debian/Dockerfile @@ -11,7 +11,7 @@ RUN curl -sL -o qemu-3.0.0+resin-arm.tar.gz https://github.com/balena-io/qemu/re FROM --platform=linux/arm/v7 arm32v7/ruby:3.2-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.16.4" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.5" ARG CROSS_BUILD_START="cross-build-start" ARG CROSS_BUILD_END="cross-build-end" RUN [ ${CROSS_BUILD_START} ] @@ -34,7 +34,7 @@ RUN apt-get update \ && gem install rexml -v 3.2.6 \ && gem install async -v 1.31.0 \ && gem install async-http -v 0.60.2 \ - && gem install fluentd -v 1.16.4 \ + && gem install fluentd -v 1.16.5 \ && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \ diff --git a/v1.16/armhf/debian/hooks/post_push b/v1.16/armhf/debian/hooks/post_push index 6ae19ae..8ae4096 100644 --- a/v1.16/armhf/debian/hooks/post_push +++ b/v1.16/armhf/debian/hooks/post_push @@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :) repoName=${IMAGE_NAME:0:tagStart-1} # Tag and push image for each additional tag -for tag in {v1.16.4-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf}; do +for tag in {v1.16.5-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} diff --git a/v1.16/debian/Dockerfile b/v1.16/debian/Dockerfile index ecbeef3..99cca8a 100644 --- a/v1.16/debian/Dockerfile +++ b/v1.16/debian/Dockerfile @@ -3,7 +3,7 @@ FROM ruby:3.2-slim-bookworm LABEL maintainer "Fluentd developers " -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.4" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.5" ENV TINI_VERSION=0.18.0 # Do not split this into multiple RUN! @@ -23,7 +23,7 @@ RUN apt-get update \ && gem install rexml -v 3.2.6 \ && gem install async -v 1.31.0 \ && gem install async-http -v 0.60.2 \ - && gem install fluentd -v 1.16.4 \ + && gem install fluentd -v 1.16.5 \ && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \ && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \ diff --git a/v1.16/debian/hooks/post_push b/v1.16/debian/hooks/post_push index 34f6fe3..207fba0 100644 --- a/v1.16/debian/hooks/post_push +++ b/v1.16/debian/hooks/post_push @@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download chmod +x manifest-tool # Tag and push image for each additional tag -for tag in {v1.16.4-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64}; do +for tag in {v1.16.5-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} diff --git a/v1.16/windows-ltsc2019/Dockerfile b/v1.16/windows-ltsc2019/Dockerfile index ea72f39..6d9c31b 100644 --- a/v1.16/windows-ltsc2019/Dockerfile +++ b/v1.16/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.16.4" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.5" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -11,14 +11,14 @@ RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ( # NOTE: For avoiding stalling with docker build on windows, we must use latest version of msys2. RUN choco install -y ruby --version 3.1.3.1 --params "'/InstallDir:C:\ruby31'" \ -&& choco install -y msys2 --version 20231026.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby31\msys64'" +&& choco install -y msys2 --version 20240113.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby31\msys64'" RUN refreshenv \ && ridk install 3 \ && echo gem: --no-document >> C:\ProgramData\gemrc \ && gem install oj -v 3.16.1 \ && gem install json -v 2.6.3 \ && gem install rexml -v 3.2.6 \ -&& gem install fluentd -v 1.16.4 \ +&& gem install fluentd -v 1.16.5 \ && 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.16/windows-ltsc2019/hooks/post_push b/v1.16/windows-ltsc2019/hooks/post_push index b843068..d339275 100644 --- a/v1.16/windows-ltsc2019/hooks/post_push +++ b/v1.16/windows-ltsc2019/hooks/post_push @@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :) repoName=${IMAGE_NAME:0:tagStart-1} # Tag and push image for each additional tag -for tag in {v1.16.4-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1}; do +for tag in {v1.16.5-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag} diff --git a/v1.16/windows-ltsc2022/Dockerfile b/v1.16/windows-ltsc2022/Dockerfile index 228644c..f345cea 100644 --- a/v1.16/windows-ltsc2022/Dockerfile +++ b/v1.16/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.16.4" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.5" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -11,14 +11,14 @@ RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ( # NOTE: For avoiding stalling with docker build on windows, we must use latest version of msys2. RUN choco install -y ruby --version 3.1.3.1 --params "'/InstallDir:C:\ruby31'" \ -&& choco install -y msys2 --version 20231026.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby31\msys64'" +&& choco install -y msys2 --version 20240113.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby31\msys64'" RUN refreshenv \ && ridk install 3 \ && echo gem: --no-document >> C:\ProgramData\gemrc \ && gem install oj -v 3.16.1 \ && gem install json -v 2.6.3 \ && gem install rexml -v 3.2.6 \ -&& gem install fluentd -v 1.16.4 \ +&& gem install fluentd -v 1.16.5 \ && 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.16/windows-ltsc2022/hooks/post_push b/v1.16/windows-ltsc2022/hooks/post_push index f8c25c9..9e29c5c 100644 --- a/v1.16/windows-ltsc2022/hooks/post_push +++ b/v1.16/windows-ltsc2022/hooks/post_push @@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :) repoName=${IMAGE_NAME:0:tagStart-1} # Tag and push image for each additional tag -for tag in {v1.16.4-windows-ltsc2022-1.0,v1.16-windows-ltsc2022-1}; do +for tag in {v1.16.5-windows-ltsc2022-1.0,v1.16-windows-ltsc2022-1}; do docker tag $IMAGE_NAME ${repoName}:${tag} docker push ${repoName}:${tag}