Skip to content

Commit

Permalink
Add v1.16.6 images
Browse files Browse the repository at this point in the history 
Signed-off-by: Kentaro Hayashi <[email protected]>
  • Loading branch information
@kenhys
kenhys committed Aug 20, 2024
1 parent c5751ca commit fee2f87
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 21 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.19
LABEL maintainer "Fluentd developers <[email protected]>"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.5"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"

# 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.5 \
&& gem install fluentd -v 1.16.6 \
&& 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
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.5-1.0,v1.16-2,edge}; do
for tag in {v1.16.6-1.0,v1.16-2,edge}; do
docker tag $IMAGE_NAME ${repoName}:${tag}
docker push ${repoName}:${tag}

Expand Down
6 changes: 3 additions & 3 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 --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.5"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
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.5 \
&& gem install fluentd -v 1.16.6 \
&& 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 All @@ -45,7 +45,7 @@ RUN apt-get update \
&& chmod +x /usr/local/bin/tini \
&& tini -h \
&& 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 \
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
# Don't use MADV_FREE to reduce memory usage and improve stability
# https://github.com/fluent/fluentd-docker-image/pull/350
&& (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \
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.5-debian-arm64-1.0,v1.16-debian-arm64-2,edge-debian-arm64}; do
for tag in {v1.16.6-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
6 changes: 3 additions & 3 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 --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.5"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
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.5 \
&& gem install fluentd -v 1.16.6 \
&& 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 All @@ -45,7 +45,7 @@ RUN apt-get update \
&& chmod +x /usr/local/bin/tini \
&& tini -h \
&& 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 \
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
# Don't use MADV_FREE to reduce memory usage and improve stability
# https://github.com/fluent/fluentd-docker-image/pull/350
&& (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \
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.5-debian-armhf-1.0,v1.16-debian-armhf-2,edge-debian-armhf}; do
for tag in {v1.16.6-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
6 changes: 3 additions & 3 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.2-slim-bookworm
LABEL maintainer "Fluentd developers <[email protected]>"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.5"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
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.5 \
&& gem install fluentd -v 1.16.6 \
&& 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 All @@ -34,7 +34,7 @@ RUN apt-get update \
&& chmod +x /usr/local/bin/tini \
&& tini -h \
&& 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 \
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
&& cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
# Don't use MADV_FREE to reduce memory usage and improve stability
# https://github.com/fluent/fluentd-docker-image/pull/350
&& (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \
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.5-debian-amd64-1.0,v1.16-debian-amd64-2,edge-debian-amd64}; do
for tag in {v1.16.6-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
4 changes: 2 additions & 2 deletions v1.16/windows-ltsc2019/Dockerfile
View file
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.16.5"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
Expand All @@ -18,7 +18,7 @@ RUN refreshenv \
&& 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.5 \
&& gem install fluentd -v 1.16.6 \
&& 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.5-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1}; do
for tag in {v1.16.6-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1}; do
docker tag $IMAGE_NAME ${repoName}:${tag}
docker push ${repoName}:${tag}

Expand Down
4 changes: 2 additions & 2 deletions v1.16/windows-ltsc2022/Dockerfile
View file
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.16.5"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
Expand All @@ -18,7 +18,7 @@ RUN refreshenv \
&& 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.5 \
&& gem install fluentd -v 1.16.6 \
&& 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.5-windows-ltsc2022-1.0,v1.16-windows-ltsc2022-1}; do
for tag in {v1.16.6-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 fee2f87

Please sign in to comment.