Skip to content

Commit 35f8f79

Browse files
kenhyskenhys
authored
Merge pull request #412 from kenhys/release-v1.16.7
Add v1.16.7 images
2 parents 184e664 + fc432f5 commit 35f8f79

File tree

9 files changed

+33
-33
lines changed

9 files changed

+33
-33
lines changed

‎Dockerfile.template.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ RUN refreshenv \
8080
&& echo gem: --no-document >> C:\ProgramData\gemrc \
8181
&& gem install oj -v 3.16.1 \
8282
&& gem install json -v 2.6.3 \
83-
&& gem install rexml -v 3.2.6 \
83+
&& gem install rexml -v 3.4.0 \
8484
&& gem install fluentd -v <%= fluentd_ver %> \
8585
&& gem install win32-service -v 2.3.2 \
8686
&& gem install win32-ipc -v 0.7.0 \
@@ -116,7 +116,7 @@ RUN apt-get update \
116116
&& echo 'gem: --no-document' >> /etc/gemrc \
117117
&& gem install oj -v 3.16.1 \
118118
&& gem install json -v 2.6.3 \
119-
&& gem install rexml -v 3.2.6 \
119+
&& gem install rexml -v 3.4.0 \
120120
&& gem install async -v 1.31.0 \
121121
&& gem install async-http -v 0.60.2 \
122122
&& gem install fluentd -v <%= fluentd_ver %> \

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717

1818
IMAGE_NAME := fluent/fluentd
1919
X86_IMAGES := \
20-
v1.16/alpine:v1.16.6-1.0,v1.16-2,edge \
21-
v1.16/debian:v1.16.6-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64
20+
v1.16/alpine:v1.16.7-1.0,v1.16-2,edge \
21+
v1.16/debian:v1.16.7-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64
2222
# <Dockerfile>:<version>,<tag1>,<tag2>,...
2323

2424
# Define images for running on ARM platforms
2525
ARM_IMAGES := \
26-
v1.16/armhf/debian:v1.16.6-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf \
26+
v1.16/armhf/debian:v1.16.7-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf \
2727

2828
# Define images for running on ARM64 platforms
2929
ARM64_IMAGES := \
30-
v1.16/arm64/debian:v1.16.6-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64 \
30+
v1.16/arm64/debian:v1.16.7-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64 \
3131

3232
WINDOWS_IMAGES := \
33-
v1.16/windows-ltsc2019:v1.16.6-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1 \
34-
v1.16/windows-ltsc2022:v1.16.6-windows-ltsc2022-1.0,v1.16-windows-ltsc2022-1
33+
v1.16/windows-ltsc2019:v1.16.7-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1 \
34+
v1.16/windows-ltsc2022:v1.16.7-windows-ltsc2022-1.0,v1.16-windows-ltsc2022-1
3535

3636
LINUX_IMAGES := $(X86_IMAGES) $(ARM_IMAGES) $(ARM64_IMAGES)
3737
ALL_IMAGES := $(LINUX_IMAGES) $(WINDOWS_IMAGES)

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ These tags have image version postfix. This updates many places so we need feedb
2222

2323
Current images use fluentd v1 series.
2424

25-
- `v1.16.5-1.0`, `v1.16-2`, `edge`
25+
- `v1.16.7-1.0`, `v1.16-2`, `edge`
2626
[(v1.16/alpine/Dockerfile)][fluentd-1-alpine]
27-
- `v1.16.5-debian-1.0`, `v1.16-debian-2`, `edge-debian`
27+
- `v1.16.7-debian-1.0`, `v1.16-debian-2`, `edge-debian`
2828
(multiarch image for arm64(AArch64) and amd64(x86_64))
29-
- `v1.16.5-debian-amd64-1.0`, `v1.16-debian-amd64-2`, `edge-debian-amd64`
29+
- `v1.16.7-debian-amd64-1.0`, `v1.16-debian-amd64-2`, `edge-debian-amd64`
3030
[(v1.16/debian/Dockerfile)][fluentd-1-debian]
31-
- `v1.16.5-debian-arm64-1.0`, `v1.16-debian-arm64-2`, `edge-debian-arm64`
31+
- `v1.16.7-debian-arm64-1.0`, `v1.16-debian-arm64-2`, `edge-debian-arm64`
3232
[(v1.16/arm64/debian/Dockerfile)][fluentd-1-debian-arm64]
33-
- `v1.16.5-debian-armhf-1.0`, `v1.16-debian-armhf-2`, `edge-debian-armhf`
33+
- `v1.16.7-debian-armhf-1.0`, `v1.16-debian-armhf-2`, `edge-debian-armhf`
3434
[(v1.16/armhf/debian/Dockerfile)][fluentd-1-debian-armhf]
35-
- `v1.16.5-windows-ltsc2019-1.0`, `v1.16-windows-ltsc2019-1`
35+
- `v1.16.7-windows-ltsc2019-1.0`, `v1.16-windows-ltsc2019-1`
3636
[(v1.16/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows]
37-
- `v1.16.5-windows-ltsc2022-1.0`, `v1.16-windows-ltsc2022-1`
37+
- `v1.16.7-windows-ltsc2022-1.0`, `v1.16-windows-ltsc2022-1`
3838
[(v1.16/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows]
3939

4040
### Old v1.4 images

‎v1.16/alpine/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
FROM alpine:3.19
55
LABEL maintainer "Fluentd developers <[email protected]>"
6-
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
6+
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.7"
77

88
# Do not split this into multiple RUN!
99
# Docker creates a layer for every RUN-Statement
@@ -19,10 +19,10 @@ RUN apk update \
1919
&& echo 'gem: --no-document' >> /etc/gemrc \
2020
&& gem install oj -v 3.16.1 \
2121
&& gem install json -v 2.6.3 \
22-
&& gem install rexml -v 3.2.6 \
22+
&& gem install rexml -v 3.4.0 \
2323
&& gem install async -v 1.31.0 \
2424
&& gem install async-http -v 0.60.2 \
25-
&& gem install fluentd -v 1.16.6 \
25+
&& gem install fluentd -v 1.16.7 \
2626
&& gem install bigdecimal -v 1.4.4 \
2727
&& apk del .build-deps \
2828
&& rm -rf /var/cache/apk/* \

‎v1.16/arm64/debian/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/q
1111
FROM --platform=linux/arm64 arm64v8/ruby:3.2-slim-bookworm
1212
COPY --from=builder /go/qemu-aarch64-static /usr/bin/
1313
LABEL maintainer "Fluentd developers <[email protected]>"
14-
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
14+
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.7"
1515
ARG CROSS_BUILD_START="cross-build-start"
1616
ARG CROSS_BUILD_END="cross-build-end"
1717
RUN [ ${CROSS_BUILD_START} ]
@@ -31,10 +31,10 @@ RUN apt-get update \
3131
&& echo 'gem: --no-document' >> /etc/gemrc \
3232
&& gem install oj -v 3.16.1 \
3333
&& gem install json -v 2.6.3 \
34-
&& gem install rexml -v 3.2.6 \
34+
&& gem install rexml -v 3.4.0 \
3535
&& gem install async -v 1.31.0 \
3636
&& gem install async-http -v 0.60.2 \
37-
&& gem install fluentd -v 1.16.6 \
37+
&& gem install fluentd -v 1.16.7 \
3838
&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
3939
&& wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \
4040
&& wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \

‎v1.16/armhf/debian/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN curl -sL -o qemu-3.0.0+resin-arm.tar.gz https://github.com/balena-io/qemu/re
1111
FROM --platform=linux/arm/v7 arm32v7/ruby:3.2-slim-bookworm
1212
COPY --from=builder /go/qemu-arm-static /usr/bin/
1313
LABEL maintainer "Fluentd developers <[email protected]>"
14-
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
14+
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.7"
1515
ARG CROSS_BUILD_START="cross-build-start"
1616
ARG CROSS_BUILD_END="cross-build-end"
1717
RUN [ ${CROSS_BUILD_START} ]
@@ -31,10 +31,10 @@ RUN apt-get update \
3131
&& echo 'gem: --no-document' >> /etc/gemrc \
3232
&& gem install oj -v 3.16.1 \
3333
&& gem install json -v 2.6.3 \
34-
&& gem install rexml -v 3.2.6 \
34+
&& gem install rexml -v 3.4.0 \
3535
&& gem install async -v 1.31.0 \
3636
&& gem install async-http -v 0.60.2 \
37-
&& gem install fluentd -v 1.16.6 \
37+
&& gem install fluentd -v 1.16.7 \
3838
&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
3939
&& wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \
4040
&& wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \

‎v1.16/debian/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
FROM ruby:3.2-slim-bookworm
55
LABEL maintainer "Fluentd developers <[email protected]>"
6-
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
6+
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.7"
77
ENV TINI_VERSION=0.18.0
88

99
# Do not split this into multiple RUN!
@@ -20,10 +20,10 @@ RUN apt-get update \
2020
&& echo 'gem: --no-document' >> /etc/gemrc \
2121
&& gem install oj -v 3.16.1 \
2222
&& gem install json -v 2.6.3 \
23-
&& gem install rexml -v 3.2.6 \
23+
&& gem install rexml -v 3.4.0 \
2424
&& gem install async -v 1.31.0 \
2525
&& gem install async-http -v 0.60.2 \
26-
&& gem install fluentd -v 1.16.6 \
26+
&& gem install fluentd -v 1.16.7 \
2727
&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
2828
&& wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \
2929
&& wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \

‎v1.16/windows-ltsc2019/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019
55
LABEL maintainer "Fluentd developers <[email protected]>"
6-
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
6+
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.7"
77

88
# Do not split this into multiple RUN!
99
# Docker creates a layer for every RUN-Statement
@@ -17,8 +17,8 @@ RUN refreshenv \
1717
&& echo gem: --no-document >> C:\ProgramData\gemrc \
1818
&& gem install oj -v 3.16.1 \
1919
&& gem install json -v 2.6.3 \
20-
&& gem install rexml -v 3.2.6 \
21-
&& gem install fluentd -v 1.16.6 \
20+
&& gem install rexml -v 3.4.0 \
21+
&& gem install fluentd -v 1.16.7 \
2222
&& gem install win32-service -v 2.3.2 \
2323
&& gem install win32-ipc -v 0.7.0 \
2424
&& gem install win32-event -v 0.6.3 \

‎v1.16/windows-ltsc2022/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2022
55
LABEL maintainer "Fluentd developers <[email protected]>"
6-
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
6+
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.7"
77

88
# Do not split this into multiple RUN!
99
# Docker creates a layer for every RUN-Statement
@@ -17,8 +17,8 @@ RUN refreshenv \
1717
&& echo gem: --no-document >> C:\ProgramData\gemrc \
1818
&& gem install oj -v 3.16.1 \
1919
&& gem install json -v 2.6.3 \
20-
&& gem install rexml -v 3.2.6 \
21-
&& gem install fluentd -v 1.16.6 \
20+
&& gem install rexml -v 3.4.0 \
21+
&& gem install fluentd -v 1.16.7 \
2222
&& gem install win32-service -v 2.3.2 \
2323
&& gem install win32-ipc -v 0.7.0 \
2424
&& gem install win32-event -v 0.6.3 \

0 commit comments

Comments
 (0)