Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@

IMAGE_NAME := fluent/fluentd
X86_IMAGES := \
v1.19/debian:v1.19.0-debian-amd64-2.1,v1.19-debian-amd64-2,v1.19.0-debian-amd64,edge-debian-amd64
v1.19/debian:v1.19.1-debian-amd64-2.0,v1.19-debian-amd64-2,v1.19.1-debian-amd64,edge-debian-amd64
# <Dockerfile>:<version>,<tag1>,<tag2>,...

# Define images for running on ARM platforms
ARM_IMAGES := \
v1.19/armhf/debian:v1.19.0-debian-armhf-2.1,v1.19-debian-armhf-2,v1.19.0-debian-armhf,edge-debian-armhf
v1.19/armhf/debian:v1.19.1-debian-armhf-2.0,v1.19-debian-armhf-2,v1.19.1-debian-armhf,edge-debian-armhf

# Define images for running on ARM64 platforms
ARM64_IMAGES := \
v1.19/arm64/debian:v1.19.0-debian-arm64-2.1,v1.19-debian-arm64-2,v1.19.0-debian-arm64,edge-debian-arm64

v1.19/arm64/debian:v1.19.1-debian-arm64-2.0,v1.19-debian-arm64-2,v1.19.1-debian-arm64,edge-debian-arm64
WINDOWS_IMAGES := \
v1.19/windows-ltsc2019:v1.19.0-windows-ltsc2019-1.0,v1.19-windows-ltsc2019-1 \
v1.19/windows-ltsc2022:v1.19.0-windows-ltsc2022-1.0,v1.19-windows-ltsc2022-1
v1.19/windows-ltsc2019:v1.19.1-windows-ltsc2019-1.0,v1.19-windows-ltsc2019-1 \
v1.19/windows-ltsc2022:v1.19.1-windows-ltsc2022-1.0,v1.19-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
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.19.0-2.1`, `v1.19-2`, `edge`, `latest`
- `v1.19.1-2.0`, `v1.19-2`, `edge`, `latest`
[(v1.19/debian/Dockerfile)][fluentd-1-debian] (Since v1.19.0, alpine image will not be shipped anymore.)
- `v1.19.0-debian-2.1`, `v1.19-debian-2`, `edge-debian`
- `v1.19.1-debian-2.0`, `v1.19-debian-2`, `edge-debian`
(multiarch image for arm64(AArch64), armhf and amd64(x86_64))
- `v1.19.0-debian-amd64-2.1`, `v1.19-debian-amd64-2`, `edge-debian-amd64`
- `v1.19.1-debian-amd64-2.0`, `v1.19-debian-amd64-2`, `edge-debian-amd64`
[(v1.19/debian/Dockerfile)][fluentd-1-debian]
- `v1.19.0-debian-arm64-2.1`, `v1.19-debian-arm64-2`, `edge-debian-arm64`
- `v1.19.1-debian-arm64-2.0`, `v1.19-debian-arm64-2`, `edge-debian-arm64`
[(v1.19/arm64/debian/Dockerfile)][fluentd-1-debian-arm64]
- `v1.19.0-debian-armhf-2.1`, `v1.19-debian-armhf-2`, `edge-debian-armhf`
- `v1.19.1-debian-armhf-2.0`, `v1.19-debian-armhf-2`, `edge-debian-armhf`
[(v1.19/armhf/debian/Dockerfile)][fluentd-1-debian-armhf]
- `v1.19.0-windows-ltsc2019-1.0`, `v1.19-windows-ltsc2019-1`
- `v1.19.1-windows-ltsc2019-1.0`, `v1.19-windows-ltsc2019-1`
[(v1.19/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows]
- `v1.19.0-windows-ltsc2022-1.0`, `v1.19-windows-ltsc2022-1`
- `v1.19.1-windows-ltsc2022-1.0`, `v1.19-windows-ltsc2022-1`
[(v1.19/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows]

> [!TIP]
Expand Down
4 changes: 2 additions & 2 deletions v1.19/arm64/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM golang:alpine AS builder
FROM --platform=linux/arm64 arm64v8/ruby:3.4-slim
LABEL maintainer "Fluentd developers <[email protected]>"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.19.0"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.19.1"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
Expand All @@ -25,7 +25,7 @@ RUN apt-get update \
&& gem install rexml -v 3.4.1 \
&& gem install async -v 2.24.0 \
&& gem install async-http -v 0.89.0 \
&& gem install fluentd -v 1.19.0 \
&& gem install fluentd -v 1.19.1 \
&& unset MAKEFLAGS \
&& export GEM_DIR=$(ruby -e 'puts Gem.dir') \
&& echo GEM_DIR=$GEM_DIR \
Expand Down
4 changes: 2 additions & 2 deletions v1.19/armhf/debian/Dockerfile
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.4-slim
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.19.0"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.19.1"
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.4.1 \
&& gem install async -v 2.24.0 \
&& gem install async-http -v 0.89.0 \
&& gem install fluentd -v 1.19.0 \
&& gem install fluentd -v 1.19.1 \
&& unset MAKEFLAGS \
&& export GEM_DIR=$(ruby -e 'puts Gem.dir') \
&& echo GEM_DIR=$GEM_DIR \
Expand Down
4 changes: 2 additions & 2 deletions v1.19/debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

FROM ruby:3.4-slim
LABEL maintainer "Fluentd developers <[email protected]>"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.19.0"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.19.1"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
Expand All @@ -23,7 +23,7 @@ RUN apt-get update \
&& gem install rexml -v 3.4.1 \
&& gem install async -v 2.24.0 \
&& gem install async-http -v 0.89.0 \
&& gem install fluentd -v 1.19.0 \
&& gem install fluentd -v 1.19.1 \
&& unset MAKEFLAGS \
&& export GEM_DIR=$(ruby -e 'puts Gem.dir') \
&& echo GEM_DIR=$GEM_DIR \
Expand Down
4 changes: 2 additions & 2 deletions v1.19/windows-ltsc2019/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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.19.0"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.19.1"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
Expand All @@ -20,7 +20,7 @@ RUN refreshenv \
&& gem install oj -v 3.16.11 \
&& gem install json -v 2.13.2 \
&& gem install rexml -v 3.4.1 \
&& gem install fluentd -v 1.19.0 \
&& gem install fluentd -v 1.19.1 \
&& 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
4 changes: 2 additions & 2 deletions v1.19/windows-ltsc2022/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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.19.0"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.19.1"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
Expand All @@ -20,7 +20,7 @@ RUN refreshenv \
&& gem install oj -v 3.16.11 \
&& gem install json -v 2.13.2 \
&& gem install rexml -v 3.4.1 \
&& gem install fluentd -v 1.19.0 \
&& gem install fluentd -v 1.19.1 \
&& 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