Merge pull request #400 from kenhys/1.17.1-1.1

Add v1.17.1-1.1
fluent · Oct 29, 2024 · e77ad58 · e77ad58
2 parents a528078 + 49029f7
commit e77ad58
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 35 deletions.
diff --git a/Dockerfile.template.erb b/Dockerfile.template.erb
@@ -72,8 +72,8 @@ RUN refreshenv \
 && c:\ruby32\bin\ruby -r yaml -e "path = 'c:/ProgramData/gemrc'; yaml = YAML.safe_load(File.read(path)); yaml['install'] = '--no-document'; yaml['update'] = '--no-document'; File.write(path, YAML.dump(yaml))" \
 && type "c:\ProgramData\gemrc" \
 && gem install oj -v 3.16.5 \
-&& gem install json -v 2.7.2 \
-&& gem install rexml -v 3.3.5 \
+&& gem install json -v 2.7.4 \
+&& gem install rexml -v 3.3.9 \
 && gem install fluentd -v <%= fluentd_ver %> \
 && gem install win32-service -v 2.3.2 \
 && gem install win32-ipc -v 0.7.0 \
@@ -108,8 +108,8 @@ RUN apt-get update \
 <% end %>
  && echo 'gem: --no-document' >> /etc/gemrc \
  && gem install oj -v 3.16.5 \
- && gem install json -v 2.7.2 \
- && gem install rexml -v 3.3.5 \
+ && gem install json -v 2.7.4 \
+ && gem install rexml -v 3.3.9 \
  && gem install async -v 1.32.1 \
  && gem install async-http -v 0.64.2 \
  && gem install fluentd -v <%= fluentd_ver %> \

diff --git a/Makefile b/Makefile
@@ -17,21 +17,21 @@
 
 IMAGE_NAME := fluent/fluentd
 X86_IMAGES := \
-	v1.17/alpine:v1.17.1-1.0,v1.17-1,edge \
-	v1.17/debian:v1.17.1-debian-amd64-1.0,v1.17-debian-amd64-1,edge-debian-amd64
+	v1.17/alpine:v1.17.1-1.1,v1.17-1,edge \
+	v1.17/debian:v1.17.1-debian-amd64-1.1,v1.17-debian-amd64-1,edge-debian-amd64
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Define images for running on ARM platforms
 ARM_IMAGES := \
-	v1.17/armhf/debian:v1.17.1-debian-armhf-1.0,v1.17-debian-armhf-1,edge-debian-armhf \
+	v1.17/armhf/debian:v1.17.1-debian-armhf-1.1,v1.17-debian-armhf-1,edge-debian-armhf \
 
 # Define images for running on ARM64 platforms
 ARM64_IMAGES := \
-	v1.17/arm64/debian:v1.17.1-debian-arm64-1.0,v1.17-debian-arm64-1,edge-debian-arm64 \
+	v1.17/arm64/debian:v1.17.1-debian-arm64-1.1,v1.17-debian-arm64-1,edge-debian-arm64 \
 
 WINDOWS_IMAGES := \
-	v1.17/windows-ltsc2019:v1.17.1-windows-ltsc2019-1.0,v1.17-windows-ltsc2019-1 \
-	v1.17/windows-ltsc2022:v1.17.1-windows-ltsc2022-1.0,v1.17-windows-ltsc2022-1
+	v1.17/windows-ltsc2019:v1.17.1-windows-ltsc2019-1.1,v1.17-windows-ltsc2019-1 \
+	v1.17/windows-ltsc2022:v1.17.1-windows-ltsc2022-1.1,v1.17-windows-ltsc2022-1
 
 LINUX_IMAGES := $(X86_IMAGES) $(ARM_IMAGES) $(ARM64_IMAGES)
 ALL_IMAGES := $(LINUX_IMAGES) $(WINDOWS_IMAGES)

diff --git a/README.md b/README.md
@@ -22,19 +22,19 @@ These tags have image version postfix. This updates many places so we need feedb
 
 Current images use fluentd v1 series.
 
-- `v1.17.1-1.0`, `v1.17-1`, `edge`
+- `v1.17.1-1.1`, `v1.17-1`, `edge`
   [(v1.17/alpine/Dockerfile)][fluentd-1-alpine] (Deprecated)
-- `v1.17.1-debian-1.0`, `v1.17-debian-1`, `edge-debian`
+- `v1.17.1-debian-1.1`, `v1.17-debian-1`, `edge-debian`
   (multiarch image for arm64(AArch64) and amd64(x86_64))
-- `v1.17.1-debian-amd64-1.0`, `v1.17-debian-amd64-1`, `edge-debian-amd64`
+- `v1.17.1-debian-amd64-1.1`, `v1.17-debian-amd64-1`, `edge-debian-amd64`
   [(v1.17/debian/Dockerfile)][fluentd-1-debian]
-- `v1.17.1-debian-arm64-1.0`, `v1.17-debian-arm64-1`, `edge-debian-arm64`
+- `v1.17.1-debian-arm64-1.1`, `v1.17-debian-arm64-1`, `edge-debian-arm64`
   [(v1.17/arm64/debian/Dockerfile)][fluentd-1-debian-arm64]
-- `v1.17.1-debian-armhf-1.0`, `v1.17-debian-armhf-1`, `edge-debian-armhf`
+- `v1.17.1-debian-armhf-1.1`, `v1.17-debian-armhf-1`, `edge-debian-armhf`
   [(v1.17/armhf/debian/Dockerfile)][fluentd-1-debian-armhf]
-- `v1.17.1-windows-ltsc2019-1.0`, `v1.17-windows-ltsc2019-1`
+- `v1.17.1-windows-ltsc2019-1.1`, `v1.17-windows-ltsc2019-1`
   [(v1.17/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows]
-- `v1.17.1-windows-ltsc2022-1.0`, `v1.17-windows-ltsc2022-1`
+- `v1.17.1-windows-ltsc2022-1.1`, `v1.17-windows-ltsc2022-1`
   [(v1.17/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows]
 
 > [!TIP]

diff --git a/v1.17/alpine/Dockerfile b/v1.17/alpine/Dockerfile
@@ -18,8 +18,8 @@ RUN apk update \
         ruby-dev gnupg \
  && echo 'gem: --no-document' >> /etc/gemrc \
  && gem install oj -v 3.16.5 \
- && gem install json -v 2.7.2 \
- && gem install rexml -v 3.3.5 \
+ && gem install json -v 2.7.4 \
+ && gem install rexml -v 3.3.9 \
  && gem install async -v 1.32.1 \
  && gem install async-http -v 0.64.2 \
  && gem install fluentd -v 1.17.1 \

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

diff --git a/v1.17/arm64/debian/Dockerfile b/v1.17/arm64/debian/Dockerfile
@@ -29,8 +29,8 @@ RUN apt-get update \
  && apt-get install -y --no-install-recommends $buildDeps \
  && echo 'gem: --no-document' >> /etc/gemrc \
  && gem install oj -v 3.16.5 \
- && gem install json -v 2.7.2 \
- && gem install rexml -v 3.3.5 \
+ && gem install json -v 2.7.4 \
+ && gem install rexml -v 3.3.9 \
  && gem install async -v 1.32.1 \
  && gem install async-http -v 0.64.2 \
  && gem install fluentd -v 1.17.1 \

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

diff --git a/v1.17/armhf/debian/Dockerfile b/v1.17/armhf/debian/Dockerfile
@@ -29,8 +29,8 @@ RUN apt-get update \
  && apt-get install -y --no-install-recommends $buildDeps \
  && echo 'gem: --no-document' >> /etc/gemrc \
  && gem install oj -v 3.16.5 \
- && gem install json -v 2.7.2 \
- && gem install rexml -v 3.3.5 \
+ && gem install json -v 2.7.4 \
+ && gem install rexml -v 3.3.9 \
  && gem install async -v 1.32.1 \
  && gem install async-http -v 0.64.2 \
  && gem install fluentd -v 1.17.1 \

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

diff --git a/v1.17/debian/Dockerfile b/v1.17/debian/Dockerfile
@@ -18,8 +18,8 @@ RUN apt-get update \
  && apt-get install -y --no-install-recommends $buildDeps \
  && echo 'gem: --no-document' >> /etc/gemrc \
  && gem install oj -v 3.16.5 \
- && gem install json -v 2.7.2 \
- && gem install rexml -v 3.3.5 \
+ && gem install json -v 2.7.4 \
+ && gem install rexml -v 3.3.9 \
  && gem install async -v 1.32.1 \
  && gem install async-http -v 0.64.2 \
  && gem install fluentd -v 1.17.1 \

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

diff --git a/v1.17/windows-ltsc2019/Dockerfile b/v1.17/windows-ltsc2019/Dockerfile
@@ -18,8 +18,8 @@ RUN refreshenv \
 && c:\ruby32\bin\ruby -r yaml -e "path = 'c:/ProgramData/gemrc'; yaml = YAML.safe_load(File.read(path)); yaml['install'] = '--no-document'; yaml['update'] = '--no-document'; File.write(path, YAML.dump(yaml))" \
 && type "c:\ProgramData\gemrc" \
 && gem install oj -v 3.16.5 \
-&& gem install json -v 2.7.2 \
-&& gem install rexml -v 3.3.5 \
+&& gem install json -v 2.7.4 \
+&& gem install rexml -v 3.3.9 \
 && gem install fluentd -v 1.17.1 \
 && gem install win32-service -v 2.3.2 \
 && gem install win32-ipc -v 0.7.0 \

diff --git a/v1.17/windows-ltsc2019/hooks/post_push b/v1.17/windows-ltsc2019/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.17.1-windows-ltsc2019-1.0,v1.17-windows-ltsc2019-1}; do
+for tag in {v1.17.1-windows-ltsc2019-1.1,v1.17-windows-ltsc2019-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}
 

diff --git a/v1.17/windows-ltsc2022/Dockerfile b/v1.17/windows-ltsc2022/Dockerfile
@@ -18,8 +18,8 @@ RUN refreshenv \
 && c:\ruby32\bin\ruby -r yaml -e "path = 'c:/ProgramData/gemrc'; yaml = YAML.safe_load(File.read(path)); yaml['install'] = '--no-document'; yaml['update'] = '--no-document'; File.write(path, YAML.dump(yaml))" \
 && type "c:\ProgramData\gemrc" \
 && gem install oj -v 3.16.5 \
-&& gem install json -v 2.7.2 \
-&& gem install rexml -v 3.3.5 \
+&& gem install json -v 2.7.4 \
+&& gem install rexml -v 3.3.9 \
 && gem install fluentd -v 1.17.1 \
 && gem install win32-service -v 2.3.2 \
 && gem install win32-ipc -v 0.7.0 \

diff --git a/v1.17/windows-ltsc2022/hooks/post_push b/v1.17/windows-ltsc2022/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.17.1-windows-ltsc2022-1.0,v1.17-windows-ltsc2022-1}; do
+for tag in {v1.17.1-windows-ltsc2022-1.1,v1.17-windows-ltsc2022-1}; do
   docker tag $IMAGE_NAME ${repoName}:${tag}
   docker push ${repoName}:${tag}