diff --git a/Dockerfile.template.erb b/Dockerfile.template.erb index c4c6f36b..c24eb493 100644 --- a/Dockerfile.template.erb +++ b/Dockerfile.template.erb @@ -70,7 +70,7 @@ RUN refreshenv \ && 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.4.0 \ +&& 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 \ @@ -106,7 +106,7 @@ RUN apt-get update \ && echo 'gem: --no-document' >> /etc/gemrc \ && gem install oj -v 3.16.1 \ && gem install json -v 2.6.3 \ - && gem install rexml -v 3.4.0 \ + && gem install rexml -v 3.4.4 \ && gem install async -v 1.31.0 \ && gem install async-http -v 0.60.2 \ && gem install fluentd -v <%= fluentd_ver %> \ diff --git a/Makefile b/Makefile index ba03259c..19e3fcd1 100644 --- a/Makefile +++ b/Makefile @@ -17,21 +17,21 @@ IMAGE_NAME := fluent/fluentd X86_IMAGES := \ - v1.16/alpine:v1.16.10-1.0,v1.16-2,edge \ - v1.16/debian:v1.16.10-debian-amd64-1.0,v1.16-debian-amd64-2,v1.16.10-debian-amd64,edge-debian-amd64 + v1.16/alpine:v1.16.11-1.0,v1.16-2,edge \ + v1.16/debian:v1.16.11-debian-amd64-1.0,v1.16-debian-amd64-2,v1.16.11-debian-amd64,edge-debian-amd64 # :,,,... # Define images for running on ARM platforms ARM_IMAGES := \ - v1.16/armhf/debian:v1.16.10-debian-armhf-1.0,v1.16-debian-armhf-2,v1.16.10-debian-armhf,edge-debian-armhf \ + v1.16/armhf/debian:v1.16.11-debian-armhf-1.0,v1.16-debian-armhf-2,v1.16.11-debian-armhf,edge-debian-armhf \ # Define images for running on ARM64 platforms ARM64_IMAGES := \ - v1.16/arm64/debian:v1.16.10-debian-arm64-1.0,v1.16-debian-arm64-2,v1.16.10-debian-arm64,edge-debian-arm64 \ + v1.16/arm64/debian:v1.16.11-debian-arm64-1.0,v1.16-debian-arm64-2,v1.16.11-debian-arm64,edge-debian-arm64 \ WINDOWS_IMAGES := \ - v1.16/windows-ltsc2019:v1.16.10-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1 \ - v1.16/windows-ltsc2022:v1.16.10-windows-ltsc2022-1.0,v1.16-windows-ltsc2022-1 + v1.16/windows-ltsc2019:v1.16.11-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1 \ + v1.16/windows-ltsc2022:v1.16.11-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 da59e7be..a39f0a2f 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.10-1.0`, `v1.16-2`, `edge` +- `v1.16.11-1.0`, `v1.16-2`, `edge` [(v1.16/alpine/Dockerfile)][fluentd-1-alpine] -- `v1.16.10-debian-1.0`, `v1.16-debian-2`, `edge-debian` +- `v1.16.11-debian-1.0`, `v1.16-debian-2`, `edge-debian` (multiarch image for arm64(AArch64) and amd64(x86_64)) -- `v1.16.10-debian-amd64-1.0`, `v1.16-debian-amd64-2`, `edge-debian-amd64` +- `v1.16.11-debian-amd64-1.0`, `v1.16-debian-amd64-2`, `edge-debian-amd64` [(v1.16/debian/Dockerfile)][fluentd-1-debian] -- `v1.16.10-debian-arm64-1.0`, `v1.16-debian-arm64-2`, `edge-debian-arm64` +- `v1.16.11-debian-arm64-1.0`, `v1.16-debian-arm64-2`, `edge-debian-arm64` [(v1.16/arm64/debian/Dockerfile)][fluentd-1-debian-arm64] -- `v1.16.10-debian-armhf-1.0`, `v1.16-debian-armhf-2`, `edge-debian-armhf` +- `v1.16.11-debian-armhf-1.0`, `v1.16-debian-armhf-2`, `edge-debian-armhf` [(v1.16/armhf/debian/Dockerfile)][fluentd-1-debian-armhf] -- `v1.16.10-windows-ltsc2019-1.0`, `v1.16-windows-ltsc2019-1` +- `v1.16.11-windows-ltsc2019-1.0`, `v1.16-windows-ltsc2019-1` [(v1.16/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows] -- `v1.16.10-windows-ltsc2022-1.0`, `v1.16-windows-ltsc2022-1` +- `v1.16.11-windows-ltsc2022-1.0`, `v1.16-windows-ltsc2022-1` [(v1.16/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows] ### Old v1.4 images diff --git a/v1.16/alpine/Dockerfile b/v1.16/alpine/Dockerfile index 5f0cf655..773996f7 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.10" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.11" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -19,10 +19,10 @@ RUN apk update \ && echo 'gem: --no-document' >> /etc/gemrc \ && gem install oj -v 3.16.1 \ && gem install json -v 2.6.3 \ - && gem install rexml -v 3.4.0 \ + && gem install rexml -v 3.4.4 \ && gem install async -v 1.31.0 \ && gem install async-http -v 0.60.2 \ - && gem install fluentd -v 1.16.10 \ + && gem install fluentd -v 1.16.11 \ && gem install bigdecimal -v 1.4.4 \ && apk del .build-deps \ && rm -rf /var/cache/apk/* \ diff --git a/v1.16/arm64/debian/Dockerfile b/v1.16/arm64/debian/Dockerfile index 6142b520..91a5a823 100644 --- a/v1.16/arm64/debian/Dockerfile +++ b/v1.16/arm64/debian/Dockerfile @@ -5,7 +5,7 @@ FROM golang:alpine AS builder FROM --platform=linux/arm64 arm64v8/ruby:3.2-slim-bookworm LABEL maintainer "Fluentd developers " -LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.10" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.11" ENV TINI_VERSION=0.18.0 # Do not split this into multiple RUN! @@ -22,10 +22,10 @@ RUN apt-get update \ && echo 'gem: --no-document' >> /etc/gemrc \ && gem install oj -v 3.16.1 \ && gem install json -v 2.6.3 \ - && gem install rexml -v 3.4.0 \ + && gem install rexml -v 3.4.4 \ && gem install async -v 1.31.0 \ && gem install async-http -v 0.60.2 \ - && gem install fluentd -v 1.16.10 \ + && gem install fluentd -v 1.16.11 \ && 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/Dockerfile b/v1.16/armhf/debian/Dockerfile index 35c427af..ebf0a195 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.10" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.11" ARG CROSS_BUILD_START="cross-build-start" ARG CROSS_BUILD_END="cross-build-end" RUN [ ${CROSS_BUILD_START} ] @@ -31,10 +31,10 @@ RUN apt-get update \ && echo 'gem: --no-document' >> /etc/gemrc \ && gem install oj -v 3.16.1 \ && gem install json -v 2.6.3 \ - && gem install rexml -v 3.4.0 \ + && gem install rexml -v 3.4.4 \ && gem install async -v 1.31.0 \ && gem install async-http -v 0.60.2 \ - && gem install fluentd -v 1.16.10 \ + && gem install fluentd -v 1.16.11 \ && 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/Dockerfile b/v1.16/debian/Dockerfile index 6ae50789..a6629b00 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.10" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.11" ENV TINI_VERSION=0.18.0 # Do not split this into multiple RUN! @@ -20,10 +20,10 @@ RUN apt-get update \ && echo 'gem: --no-document' >> /etc/gemrc \ && gem install oj -v 3.16.1 \ && gem install json -v 2.6.3 \ - && gem install rexml -v 3.4.0 \ + && gem install rexml -v 3.4.4 \ && gem install async -v 1.31.0 \ && gem install async-http -v 0.60.2 \ - && gem install fluentd -v 1.16.10 \ + && gem install fluentd -v 1.16.11 \ && 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/windows-ltsc2019/Dockerfile b/v1.16/windows-ltsc2019/Dockerfile index 5c7c768f..ddd06da3 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.10" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.11" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -17,8 +17,8 @@ RUN refreshenv \ && 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.4.0 \ -&& gem install fluentd -v 1.16.10 \ +&& gem install rexml -v 3.4.4 \ +&& gem install fluentd -v 1.16.11 \ && 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/Dockerfile b/v1.16/windows-ltsc2022/Dockerfile index 368b8bf7..a03ad4f8 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.10" +LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.11" # Do not split this into multiple RUN! # Docker creates a layer for every RUN-Statement @@ -17,8 +17,8 @@ RUN refreshenv \ && 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.4.0 \ -&& gem install fluentd -v 1.16.10 \ +&& gem install rexml -v 3.4.4 \ +&& gem install fluentd -v 1.16.11 \ && gem install win32-service -v 2.3.2 \ && gem install win32-ipc -v 0.7.0 \ && gem install win32-event -v 0.6.3 \