Bump up version to v1.16.3-1.1

Change base image because:

* Use stable image instead of old-stable one because
  there is a bit delay to be shipped updates from upstream.
  (EOL of bullseye is around July, 2024)
* fluent-package LTS adopts Ruby 3.2 by default.

Closes: #371

NOTE: Update linux containers at first.

Signed-off-by: Kentaro Hayashi <[email protected]>

Dockerfile.template.erb

@@ -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 %>

Makefile

@@ -13,17 +13,17 @@
 
 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-1.1,v1.16-1,edge \
+	v1.16/debian:v1.16.3-debian-amd64-1.1,v1.16-debian-amd64-1,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-1.1,v1.16-debian-armhf-1,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-1.1,v1.16-debian-arm64-1,edge-debian-arm64 \
 
 WINDOWS_IMAGES := \
 	v1.16/windows-ltsc2019:v1.16.3-windows-ltsc2019-1.0,v1.16-windows-ltsc2019-1 \

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-1.1`, `v1.16-1`, `edge`
   [(v1.16/alpine/Dockerfile)][fluentd-1-alpine]
-- `v1.16.3-debian-1.0`, `v1.16-debian-1`, `edge-debian`
+- `v1.16.3-debian-1.1`, `v1.16-debian-1`, `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-1.1`, `v1.16-debian-amd64-1`, `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-1.1`, `v1.16-debian-arm64-1`, `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-1.1`, `v1.16-debian-armhf-1`, `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]

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" ]]
 }