Skip to content

Commit

Permalink
Add v1.16.3-1.0 images
Browse files Browse the repository at this point in the history 
This image is intended to include the fix for CVE-2023-4911 on debian.

See

* https://security-tracker.debian.org/tracker/CVE-2023-4911
* https://tracker.debian.org/news/1468062/accepted-glibc-231-13deb11u7-source-into-oldstable-security/

Related:

  fluent/fluentd-kubernetes-daemonset#1464

Signed-off-by: Kentaro Hayashi <[email protected]>
  • Loading branch information
@kenhys
kenhys committed Nov 15, 2023
1 parent 15ef663 commit e8f3cd7
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions v1.16/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

FROM alpine:3.17
LABEL maintainer "Fluentd developers <[email protected]>"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.3"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
Expand All @@ -24,7 +24,7 @@ RUN apk update \
&& gem install async-http -v 0.60.2 \
# CVE-2023-36617
&& gem install uri -v 0.12.2 \
&& gem install fluentd -v 1.16.2 \
&& gem install fluentd -v 1.16.3 \
&& gem install bigdecimal -v 1.4.4 \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
Expand Down
2 changes: 1 addition & 1 deletion v1.16/alpine/hooks/post_push
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-1.1,v1.16-1,edge}; do
for tag in {v1.16.3-1.0,v1.16-1,edge}; do
docker tag $IMAGE_NAME ${repoName}:${tag}
docker push ${repoName}:${tag}

Expand Down
4 changes: 2 additions & 2 deletions v1.16/arm64/debian/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/q
FROM arm64v8/ruby:3.1-slim-bullseye
COPY --from=builder /go/qemu-aarch64-static /usr/bin/
LABEL maintainer "Fluentd developers <[email protected]>"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.3"
ARG CROSS_BUILD_START="cross-build-start"
ARG CROSS_BUILD_END="cross-build-end"
RUN [ ${CROSS_BUILD_START} ]
Expand All @@ -36,7 +36,7 @@ RUN apt-get update \
&& gem install async-http -v 0.60.2 \
# CVE-2023-36617
&& gem install uri -v 0.12.2 \
&& gem install fluentd -v 1.16.2 \
&& gem install fluentd -v 1.16.3 \
&& 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" \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/arm64/debian/hooks/post_push
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-debian-arm64-1.1,v1.16-debian-arm64-1,edge-debian-arm64}; do
for tag in {v1.16.3-debian-arm64-1.0,v1.16-debian-arm64-1,edge-debian-arm64}; do
docker tag $IMAGE_NAME ${repoName}:${tag}
docker push ${repoName}:${tag}

Expand Down
4 changes: 2 additions & 2 deletions v1.16/armhf/debian/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN curl -sL -o qemu-3.0.0+resin-arm.tar.gz https://github.com/balena-io/qemu/re
FROM arm32v7/ruby:3.1-slim-bullseye
COPY --from=builder /go/qemu-arm-static /usr/bin/
LABEL maintainer "Fluentd developers <[email protected]>"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.3"
ARG CROSS_BUILD_START="cross-build-start"
ARG CROSS_BUILD_END="cross-build-end"
RUN [ ${CROSS_BUILD_START} ]
Expand All @@ -36,7 +36,7 @@ RUN apt-get update \
&& gem install async-http -v 0.60.2 \
# CVE-2023-36617
&& gem install uri -v 0.12.2 \
&& gem install fluentd -v 1.16.2 \
&& gem install fluentd -v 1.16.3 \
&& 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" \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/armhf/debian/hooks/post_push
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-debian-armhf-1.1,v1.16-debian-armhf-1,edge-debian-armhf}; do
for tag in {v1.16.3-debian-armhf-1.0,v1.16-debian-armhf-1,edge-debian-armhf}; do
docker tag $IMAGE_NAME ${repoName}:${tag}
docker push ${repoName}:${tag}

Expand Down
4 changes: 2 additions & 2 deletions v1.16/debian/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

FROM ruby:3.1-slim-bullseye
LABEL maintainer "Fluentd developers <[email protected]>"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.3"
ENV TINI_VERSION=0.18.0

# Do not split this into multiple RUN!
Expand All @@ -25,7 +25,7 @@ RUN apt-get update \
&& gem install async-http -v 0.60.2 \
# CVE-2023-36617
&& gem install uri -v 0.12.2 \
&& gem install fluentd -v 1.16.2 \
&& gem install fluentd -v 1.16.3 \
&& 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" \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/debian/hooks/post_push
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-debian-amd64-1.1,v1.16-debian-amd64-1,edge-debian-amd64}; do
for tag in {v1.16.3-debian-amd64-1.0,v1.16-debian-amd64-1,edge-debian-amd64}; do
docker tag $IMAGE_NAME ${repoName}:${tag}
docker push ${repoName}:${tag}

Expand Down
6 changes: 3 additions & 3 deletions v1.16/windows-ltsc2019/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019
LABEL maintainer "Fluentd developers <[email protected]>"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.3"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
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.1.3.1 --params "'/InstallDir:C:\ruby31'" \
&& choco install -y msys2 --version 20230718.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby31\msys64'"
&& choco install -y msys2 --version 20231026.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby31\msys64'"
RUN refreshenv \
&& ridk install 3 \
&& echo gem: --no-document >> C:\ProgramData\gemrc \
Expand All @@ -20,7 +20,7 @@ RUN refreshenv \
&& gem install rexml -v 3.2.6 \
# CVE-2023-36617
&& gem install uri -v 0.12.2 \
&& gem install fluentd -v 1.16.2 \
&& gem install fluentd -v 1.16.3 \
&& gem install win32-service -v 2.3.2 \
&& gem install win32-ipc -v 0.7.0 \
&& gem install win32-event -v 0.6.3 \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/windows-ltsc2019/hooks/post_push
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-windows-ltsc2019-1.1,v1.16-windows-ltsc2019-1}; do
for tag in {v1.16.3-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1}; do
docker tag $IMAGE_NAME ${repoName}:${tag}
docker push ${repoName}:${tag}

Expand Down
6 changes: 3 additions & 3 deletions v1.16/windows-ltsc2022/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022
LABEL maintainer "Fluentd developers <[email protected]>"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.3"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
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.1.3.1 --params "'/InstallDir:C:\ruby31'" \
&& choco install -y msys2 --version 20230718.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby31\msys64'"
&& choco install -y msys2 --version 20231026.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby31\msys64'"
RUN refreshenv \
&& ridk install 3 \
&& echo gem: --no-document >> C:\ProgramData\gemrc \
Expand All @@ -20,7 +20,7 @@ RUN refreshenv \
&& gem install rexml -v 3.2.6 \
# CVE-2023-36617
&& gem install uri -v 0.12.2 \
&& gem install fluentd -v 1.16.2 \
&& gem install fluentd -v 1.16.3 \
&& gem install win32-service -v 2.3.2 \
&& gem install win32-ipc -v 0.7.0 \
&& gem install win32-event -v 0.6.3 \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/windows-ltsc2022/hooks/post_push
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-windows-ltsc2022-1.1,v1.16-windows-ltsc2022-1}; do
for tag in {v1.16.3-windows-ltsc2022-1.0,v1.16-windows-ltsc2022-1}; do
docker tag $IMAGE_NAME ${repoName}:${tag}
docker push ${repoName}:${tag}

Expand Down

0 comments on commit e8f3cd7

Please sign in to comment.