Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add v1.16.5 images #379

Merged
merged 3 commits into from
Mar 28, 2024
Merged

Add v1.16.5 images #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90f03cc
Bump up version to v1.16.5
ashie Mar 28, 2024
75c7c6d
Upgrade msys2 to 20240113.0.0
ashie Mar 28, 2024
e0a125a
Add v1.16.5 images
ashie Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.template.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# <Dockerfile>:<version>,<tag1>,<tag2>,...

# 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)
Expand Down
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions v1.16/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

FROM alpine:3.19
LABEL maintainer "Fluentd developers <[email protected]>"
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
Expand All @@ -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/* \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/alpine/hooks/post_push
View file
Open in desktop
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.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}

Expand Down
4 changes: 2 additions & 2 deletions v1.16/arm64/debian/Dockerfile
View file
Open in desktop
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 --platform=linux/arm64 arm64v8/ruby:3.2-slim-bookworm
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.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} ]
Expand All @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/arm64/debian/hooks/post_push
View file
Open in desktop
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.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}

Expand Down
4 changes: 2 additions & 2 deletions v1.16/armhf/debian/Dockerfile
View file
Open in desktop
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 --platform=linux/arm/v7 arm32v7/ruby:3.2-slim-bookworm
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.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} ]
Expand All @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/armhf/debian/hooks/post_push
View file
Open in desktop
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.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}

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

FROM ruby:3.2-slim-bookworm
LABEL maintainer "Fluentd developers <[email protected]>"
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!
Expand All @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/debian/hooks/post_push
View file
Open in desktop
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.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}

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

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.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
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 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 \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/windows-ltsc2019/hooks/post_push
View file
Open in desktop
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.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}

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

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.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
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 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 \
Expand Down
2 changes: 1 addition & 1 deletion v1.16/windows-ltsc2022/hooks/post_push
View file
Open in desktop
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.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}

Expand Down