Merge pull request #372 from fluent/rebuild

Sync with recent upstream image
fluent · Jan 16, 2024 · 16b8a68 · 16b8a68
2 parents f9efad0 + 4f1d5e8
commit 16b8a68
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 23 deletions.
diff --git a/Dockerfile.template.erb b/Dockerfile.template.erb
@@ -18,7 +18,7 @@ FROM mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-<%= window
 <% if is_armhf %>
 FROM resin/armhf-alpine:3.7
 <% else %>
-FROM alpine:3.17
+FROM alpine:3.19
 <% end %>
 <% else %>
 <% if is_armhf %>
@@ -29,7 +29,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/
 <% elsif is_arm64 %>
 # To set multiarch build for Docker hub automated build.
@@ -39,10 +39,10 @@ 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/
 <% else %>
-FROM ruby:3.1-slim-bullseye
+FROM ruby:3.2-slim-bookworm
 <% end %>
 <% end %>
 <% end %>
@@ -147,6 +147,7 @@ RUN apt-get update \
  && apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
 <% end %>
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test

diff --git a/Makefile b/Makefile
@@ -11,19 +11,23 @@
 #	make release-all
 
 
+# IMPORTANT: Upgraded base image & Ruby without upgrading fluentd,
+# incremented major revision (2.0) instead of minor.
+# This update pattern is unusual, so user may be overlooked it.
+
 IMAGE_NAME := fluent/fluentd
 X86_IMAGES := \
-	v1.16/alpine:v1.16.3-1.0,v1.16-1,edge \
-	v1.16/debian:v1.16.3-debian-amd64-1.0,v1.16-debian-amd64-1,edge-debian-amd64
+	v1.16/alpine:v1.16.3-2.0,v1.16-2,edge \
+	v1.16/debian:v1.16.3-debian-amd64-2.0,v1.16-debian-amd64-2,edge-debian-amd64
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Define images for running on ARM platforms
 ARM_IMAGES := \
-	v1.16/armhf/debian:v1.16.3-debian-armhf-1.0,v1.16-debian-armhf-1,edge-debian-armhf \
+	v1.16/armhf/debian:v1.16.3-debian-armhf-2.0,v1.16-debian-armhf-2,edge-debian-armhf \
 
 # Define images for running on ARM64 platforms
 ARM64_IMAGES := \
-	v1.16/arm64/debian:v1.16.3-debian-arm64-1.0,v1.16-debian-arm64-1,edge-debian-arm64 \
+	v1.16/arm64/debian:v1.16.3-debian-arm64-2.0,v1.16-debian-arm64-2,edge-debian-arm64 \
 
 WINDOWS_IMAGES := \
 	v1.16/windows-ltsc2019:v1.16.3-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1 \

diff --git a/README.md b/README.md
@@ -22,15 +22,15 @@ These tags have image version postfix. This updates many places so we need feedb
 
 Current images use fluentd v1 series.
 
-- `v1.16.3-1.0`, `v1.16-1`, `edge`
+- `v1.16.3-2.0`, `v1.16-2`, `edge`
   [(v1.16/alpine/Dockerfile)][fluentd-1-alpine]
-- `v1.16.3-debian-1.0`, `v1.16-debian-1`, `edge-debian`
+- `v1.16.3-debian-2.0`, `v1.16-debian-2`, `edge-debian`
   (multiarch image for arm64(AArch64) and amd64(x86_64))
-- `v1.16.3-debian-amd64-1.0`, `v1.16-debian-amd64-1`, `edge-debian-amd64`
+- `v1.16.3-debian-amd64-2.0`, `v1.16-debian-amd64-2`, `edge-debian-amd64`
   [(v1.16/debian/Dockerfile)][fluentd-1-debian]
-- `v1.16.3-debian-arm64-1.0`, `v1.16-debian-arm64-1`, `edge-debian-arm64`
+- `v1.16.3-debian-arm64-2.0`, `v1.16-debian-arm64-2`, `edge-debian-arm64`
   [(v1.16/arm64/debian/Dockerfile)][fluentd-1-debian-arm64]
-- `v1.16.3-debian-armhf-1.0`, `v1.16-debian-armhf-1`, `edge-debian-armhf`
+- `v1.16.3-debian-armhf-2.0`, `v1.16-debian-armhf-2`, `edge-debian-armhf`
   [(v1.16/armhf/debian/Dockerfile)][fluentd-1-debian-armhf]
 - `v1.16.3-windows-ltsc2019-1.0`, `v1.16-windows-ltsc2019-1`
   [(v1.16/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows]

diff --git a/test/suite.bats b/test/suite.bats
@@ -22,14 +22,14 @@
 }
 
 
-@test "ruby version is 3.1" {
+@test "ruby version is 3.2" {
   run docker run --rm $IMAGE sh -c "ruby --version | cut -d ' ' -f 2"
   [ "$status" -eq 0 ]
 
   major=$(echo "$output" | cut -d '.' -f 1)
   minor=$(echo "$output" | cut -d '.' -f 2)
   [ "$major" -eq "3" ]
-  [[ "$minor" -eq "1" ]]
+  [[ "$minor" -eq "2" ]]
 }
 
 

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}