Skip to content

Commit ddb5019

Browse files
daipomdaipom
authored
Merge pull request #388 from fluent/release-v1.16.6
Add v1.16.6 images
2 parents e0a125a + fee2f87 commit ddb5019

File tree

14 files changed

+28
-28
lines changed

14 files changed

+28
-28
lines changed

‎Dockerfile.template.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ RUN apt-get update \
135135
&& chmod +x /usr/local/bin/tini \
136136
&& tini -h \
137137
&& wget -O /tmp/jemalloc-5.3.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 \
138-
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
138+
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
139139
# Don't use MADV_FREE to reduce memory usage and improve stability
140140
# https://github.com/fluent/fluentd-docker-image/pull/350
141141
&& (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \

‎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.5-1.0,v1.16-2,edge \
21-
v1.16/debian:v1.16.5-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64
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
2222
# <Dockerfile>:<version>,<tag1>,<tag2>,...
2323

2424
# Define images for running on ARM platforms
2525
ARM_IMAGES := \
26-
v1.16/armhf/debian:v1.16.5-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf \
26+
v1.16/armhf/debian:v1.16.6-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.5-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64 \
30+
v1.16/arm64/debian:v1.16.6-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64 \
3131

3232
WINDOWS_IMAGES := \
33-
v1.16/windows-ltsc2019:v1.16.5-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1 \
34-
v1.16/windows-ltsc2022:v1.16.5-windows-ltsc2022-1.0,v1.16-windows-ltsc2022-1
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
3535

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

‎v1.16/alpine/Dockerfile‎

Lines changed: 2 additions & 2 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.5"
6+
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
77

88
# Do not split this into multiple RUN!
99
# Docker creates a layer for every RUN-Statement
@@ -22,7 +22,7 @@ RUN apk update \
2222
&& gem install rexml -v 3.2.6 \
2323
&& gem install async -v 1.31.0 \
2424
&& gem install async-http -v 0.60.2 \
25-
&& gem install fluentd -v 1.16.5 \
25+
&& gem install fluentd -v 1.16.6 \
2626
&& gem install bigdecimal -v 1.4.4 \
2727
&& apk del .build-deps \
2828
&& rm -rf /var/cache/apk/* \

‎v1.16/alpine/hooks/post_push‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
99
repoName=${IMAGE_NAME:0:tagStart-1}
1010

1111
# Tag and push image for each additional tag
12-
for tag in {v1.16.5-1.0,v1.16-2,edge}; do
12+
for tag in {v1.16.6-1.0,v1.16-2,edge}; do
1313
docker tag $IMAGE_NAME ${repoName}:${tag}
1414
docker push ${repoName}:${tag}
1515

‎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.5"
14+
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
1515
ARG CROSS_BUILD_START="cross-build-start"
1616
ARG CROSS_BUILD_END="cross-build-end"
1717
RUN [ ${CROSS_BUILD_START} ]
@@ -34,7 +34,7 @@ RUN apt-get update \
3434
&& gem install rexml -v 3.2.6 \
3535
&& gem install async -v 1.31.0 \
3636
&& gem install async-http -v 0.60.2 \
37-
&& gem install fluentd -v 1.16.5 \
37+
&& gem install fluentd -v 1.16.6 \
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" \
@@ -45,7 +45,7 @@ RUN apt-get update \
4545
&& chmod +x /usr/local/bin/tini \
4646
&& tini -h \
4747
&& wget -O /tmp/jemalloc-5.3.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 \
48-
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
48+
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
4949
# Don't use MADV_FREE to reduce memory usage and improve stability
5050
# https://github.com/fluent/fluentd-docker-image/pull/350
5151
&& (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \

‎v1.16/arm64/debian/hooks/post_push‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download
1313
chmod +x manifest-tool
1414

1515
# Tag and push image for each additional tag
16-
for tag in {v1.16.5-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64}; do
16+
for tag in {v1.16.6-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64}; do
1717
docker tag $IMAGE_NAME ${repoName}:${tag}
1818
docker push ${repoName}:${tag}
1919

‎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.5"
14+
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
1515
ARG CROSS_BUILD_START="cross-build-start"
1616
ARG CROSS_BUILD_END="cross-build-end"
1717
RUN [ ${CROSS_BUILD_START} ]
@@ -34,7 +34,7 @@ RUN apt-get update \
3434
&& gem install rexml -v 3.2.6 \
3535
&& gem install async -v 1.31.0 \
3636
&& gem install async-http -v 0.60.2 \
37-
&& gem install fluentd -v 1.16.5 \
37+
&& gem install fluentd -v 1.16.6 \
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" \
@@ -45,7 +45,7 @@ RUN apt-get update \
4545
&& chmod +x /usr/local/bin/tini \
4646
&& tini -h \
4747
&& wget -O /tmp/jemalloc-5.3.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 \
48-
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
48+
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
4949
# Don't use MADV_FREE to reduce memory usage and improve stability
5050
# https://github.com/fluent/fluentd-docker-image/pull/350
5151
&& (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \

‎v1.16/armhf/debian/hooks/post_push‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ tagStart=$(expr index "$IMAGE_NAME" :)
99
repoName=${IMAGE_NAME:0:tagStart-1}
1010

1111
# Tag and push image for each additional tag
12-
for tag in {v1.16.5-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf}; do
12+
for tag in {v1.16.6-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf}; do
1313
docker tag $IMAGE_NAME ${repoName}:${tag}
1414
docker push ${repoName}:${tag}
1515

‎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.5"
6+
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
77
ENV TINI_VERSION=0.18.0
88

99
# Do not split this into multiple RUN!
@@ -23,7 +23,7 @@ RUN apt-get update \
2323
&& gem install rexml -v 3.2.6 \
2424
&& gem install async -v 1.31.0 \
2525
&& gem install async-http -v 0.60.2 \
26-
&& gem install fluentd -v 1.16.5 \
26+
&& gem install fluentd -v 1.16.6 \
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" \
@@ -34,7 +34,7 @@ RUN apt-get update \
3434
&& chmod +x /usr/local/bin/tini \
3535
&& tini -h \
3636
&& wget -O /tmp/jemalloc-5.3.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 \
37-
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
37+
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
3838
# Don't use MADV_FREE to reduce memory usage and improve stability
3939
# https://github.com/fluent/fluentd-docker-image/pull/350
4040
&& (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \

‎v1.16/debian/hooks/post_push‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download
1313
chmod +x manifest-tool
1414

1515
# Tag and push image for each additional tag
16-
for tag in {v1.16.5-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64}; do
16+
for tag in {v1.16.6-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64}; do
1717
docker tag $IMAGE_NAME ${repoName}:${tag}
1818
docker push ${repoName}:${tag}
1919

0 commit comments

Comments
 (0)