Add v1.16.3-2.0 images

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
fluent · Jan 15, 2024 · 4f1d5e8 · 4f1d5e8
1 parent 6707807
commit 4f1d5e8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/v1.16/alpine/Dockerfile b/v1.16/alpine/Dockerfile
@@ -1,7 +1,7 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb
 
-FROM alpine:3.17
+FROM alpine:3.19
 LABEL maintainer "Fluentd developers <fluentd@googlegroups.com>"
 LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.3"
 

diff --git a/v1.16/alpine/hooks/post_push b/v1.16/alpine/hooks/post_push
@@ -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.3-1.0,v1.16-1,edge}; do
+for tag in {v1.16.3-2.0,v1.16-2,edge}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 

diff --git a/v1.16/arm64/debian/Dockerfile b/v1.16/arm64/debian/Dockerfile
@@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf61
 RUN apk add curl --no-cache
 RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .
 
-FROM arm64v8/ruby:3.1-slim-bullseye
+FROM arm64v8/ruby:3.2-slim-bookworm
 COPY --from=builder /go/qemu-aarch64-static /usr/bin/
 LABEL maintainer "Fluentd developers <fluentd@googlegroups.com>"
 LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.3"
@@ -55,6 +55,7 @@ RUN apt-get update \
  && apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 

diff --git a/v1.16/arm64/debian/hooks/post_push b/v1.16/arm64/debian/hooks/post_push
@@ -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.3-debian-arm64-1.0,v1.16-debian-arm64-1,edge-debian-arm64}; do
+for tag in {v1.16.3-debian-arm64-2.0,v1.16-debian-arm64-2,edge-debian-arm64}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 

diff --git a/v1.16/armhf/debian/Dockerfile b/v1.16/armhf/debian/Dockerfile
@@ -8,7 +8,7 @@ ENV QEMU_DOWNLOAD_SHA256 47ae430b0e7c25e1bde290ac447a720e2ea6c6e78cd84e44847edda
 RUN apk add curl --no-cache
 RUN curl -sL -o qemu-3.0.0+resin-arm.tar.gz https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-3.0.0+resin-arm.tar.gz" | sha256sum -c - | tar zxvf qemu-3.0.0+resin-arm.tar.gz -C . && mv qemu-3.0.0+resin-arm/qemu-arm-static .
 
-FROM arm32v7/ruby:3.1-slim-bullseye
+FROM arm32v7/ruby:3.2-slim-bookworm
 COPY --from=builder /go/qemu-arm-static /usr/bin/
 LABEL maintainer "Fluentd developers <fluentd@googlegroups.com>"
 LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.3"
@@ -55,6 +55,7 @@ RUN apt-get update \
  && apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 

diff --git a/v1.16/armhf/debian/hooks/post_push b/v1.16/armhf/debian/hooks/post_push
@@ -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.3-debian-armhf-1.0,v1.16-debian-armhf-1,edge-debian-armhf}; do
+for tag in {v1.16.3-debian-armhf-2.0,v1.16-debian-armhf-2,edge-debian-armhf}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 

diff --git a/v1.16/debian/Dockerfile b/v1.16/debian/Dockerfile
@@ -1,7 +1,7 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb
 
-FROM ruby:3.1-slim-bullseye
+FROM ruby:3.2-slim-bookworm
 LABEL maintainer "Fluentd developers <fluentd@googlegroups.com>"
 LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.3"
 ENV TINI_VERSION=0.18.0
@@ -44,6 +44,7 @@ RUN apt-get update \
  && apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 

diff --git a/v1.16/debian/hooks/post_push b/v1.16/debian/hooks/post_push
@@ -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.3-debian-amd64-1.0,v1.16-debian-amd64-1,edge-debian-amd64}; do
+for tag in {v1.16.3-debian-amd64-2.0,v1.16-debian-amd64-2,edge-debian-amd64}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}