Skip to content

Commit a0dec97

Browse files
kenhyskenhys
authored
Add v1.18.0-1.3 images (#436)
* Bump version to v1.18.0-1.3 Signed-off-by: Kentaro Hayashi <[email protected]> * Bump ruby toolchain version Signed-off-by: Kentaro Hayashi <[email protected]> * Add v1.18.0 images * Bump version to 1.18.0-1.3 * Bump ruby toolchain version on Windows Signed-off-by: Kentaro Hayashi <[email protected]> --------- Signed-off-by: Kentaro Hayashi <[email protected]>
1 parent 3a7991d commit a0dec97

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

‎Dockerfile.template.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RUN [ ${CROSS_BUILD_START} ]
5454
RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))"
5555

5656
# NOTE: For avoiding stalling with docker build on windows, we must use latest version of msys2.
57-
RUN choco install -y ruby --version 3.2.6.1 --params "'/InstallDir:C:\ruby32'" \
57+
RUN choco install -y ruby --version 3.2.8.1 --params "'/InstallDir:C:\ruby32'" \
5858
&& choco install -y msys2 --version 20240727.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby32\msys64'"
5959
RUN refreshenv \
6060
&& ridk install 3 \

‎Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717

1818
IMAGE_NAME := fluent/fluentd
1919
X86_IMAGES := \
20-
v1.18/alpine:v1.18.0-1.2,v1.18-1,edge \
21-
v1.18/debian:v1.18.0-debian-amd64-1.2,v1.18-debian-amd64-1,v1.18.0-debian-amd64,edge-debian-amd64
20+
v1.18/alpine:v1.18.0-1.3,v1.18-1,edge \
21+
v1.18/debian:v1.18.0-debian-amd64-1.3,v1.18-debian-amd64-1,v1.18.0-debian-amd64,edge-debian-amd64
2222
# <Dockerfile>:<version>,<tag1>,<tag2>,...
2323

2424
# Define images for running on ARM platforms
2525
ARM_IMAGES := \
26-
v1.18/armhf/debian:v1.18.0-debian-armhf-1.2,v1.18-debian-armhf-1,v1.18.0-debian-armhf,edge-debian-armhf \
26+
v1.18/armhf/debian:v1.18.0-debian-armhf-1.3,v1.18-debian-armhf-1,v1.18.0-debian-armhf,edge-debian-armhf \
2727

2828
# Define images for running on ARM64 platforms
2929
ARM64_IMAGES := \
30-
v1.18/arm64/debian:v1.18.0-debian-arm64-1.2,v1.18-debian-arm64-1,v1.18.0-debian-arm64,edge-debian-arm64 \
30+
v1.18/arm64/debian:v1.18.0-debian-arm64-1.3,v1.18-debian-arm64-1,v1.18.0-debian-arm64,edge-debian-arm64 \
3131

3232
WINDOWS_IMAGES := \
33-
v1.18/windows-ltsc2019:v1.18.0-windows-ltsc2019-1.2,v1.18-windows-ltsc2019-1 \
34-
v1.18/windows-ltsc2022:v1.18.0-windows-ltsc2022-1.2,v1.18-windows-ltsc2022-1
33+
v1.18/windows-ltsc2019:v1.18.0-windows-ltsc2019-1.3,v1.18-windows-ltsc2019-1 \
34+
v1.18/windows-ltsc2022:v1.18.0-windows-ltsc2022-1.3,v1.18-windows-ltsc2022-1
3535

3636
LINUX_IMAGES := $(X86_IMAGES) $(ARM_IMAGES) $(ARM64_IMAGES)
3737
ALL_IMAGES := $(LINUX_IMAGES) $(WINDOWS_IMAGES)

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ These tags have image version postfix. This updates many places so we need feedb
2222

2323
Current images use fluentd v1 series.
2424

25-
- `v1.18.0-1.0`, `v1.18-1`, `edge`
25+
- `v1.18.0-1.3`, `v1.18-1`, `edge`
2626
[(v1.18/alpine/Dockerfile)][fluentd-1-alpine] (Deprecated)
27-
- `v1.18.0-debian-1.0`, `v1.18-debian-1`, `edge-debian`
27+
- `v1.18.0-debian-1.3`, `v1.18-debian-1`, `edge-debian`
2828
(multiarch image for arm64(AArch64) and amd64(x86_64))
29-
- `v1.18.0-debian-amd64-1.0`, `v1.18-debian-amd64-1`, `edge-debian-amd64`
29+
- `v1.18.0-debian-amd64-1.3`, `v1.18-debian-amd64-1`, `edge-debian-amd64`
3030
[(v1.18/debian/Dockerfile)][fluentd-1-debian]
31-
- `v1.18.0-debian-arm64-1.0`, `v1.18-debian-arm64-1`, `edge-debian-arm64`
31+
- `v1.18.0-debian-arm64-1.3`, `v1.18-debian-arm64-1`, `edge-debian-arm64`
3232
[(v1.18/arm64/debian/Dockerfile)][fluentd-1-debian-arm64]
33-
- `v1.18.0-debian-armhf-1.0`, `v1.18-debian-armhf-1`, `edge-debian-armhf`
33+
- `v1.18.0-debian-armhf-1.3`, `v1.18-debian-armhf-1`, `edge-debian-armhf`
3434
[(v1.18/armhf/debian/Dockerfile)][fluentd-1-debian-armhf]
35-
- `v1.18.0-windows-ltsc2019-1.0`, `v1.18-windows-ltsc2019-1`
35+
- `v1.18.0-windows-ltsc2019-1.3`, `v1.18-windows-ltsc2019-1`
3636
[(v1.18/windows-ltsc2019/Dockerfile)][fluentd-1-ltsc2019-windows]
37-
- `v1.18.0-windows-ltsc2022-1.0`, `v1.18-windows-ltsc2022-1`
37+
- `v1.18.0-windows-ltsc2022-1.3`, `v1.18-windows-ltsc2022-1`
3838
[(v1.18/windows-ltsc2022/Dockerfile)][fluentd-1-ltsc2022-windows]
3939

4040
> [!TIP]

‎v1.18/windows-ltsc2019/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1
1010
RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))"
1111

1212
# NOTE: For avoiding stalling with docker build on windows, we must use latest version of msys2.
13-
RUN choco install -y ruby --version 3.2.6.1 --params "'/InstallDir:C:\ruby32'" \
13+
RUN choco install -y ruby --version 3.2.8.1 --params "'/InstallDir:C:\ruby32'" \
1414
&& choco install -y msys2 --version 20240727.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby32\msys64'"
1515
RUN refreshenv \
1616
&& ridk install 3 \

‎v1.18/windows-ltsc2022/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1
1010
RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))"
1111

1212
# NOTE: For avoiding stalling with docker build on windows, we must use latest version of msys2.
13-
RUN choco install -y ruby --version 3.2.6.1 --params "'/InstallDir:C:\ruby32'" \
13+
RUN choco install -y ruby --version 3.2.8.1 --params "'/InstallDir:C:\ruby32'" \
1414
&& choco install -y msys2 --version 20240727.0.0 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby32\msys64'"
1515
RUN refreshenv \
1616
&& ridk install 3 \

0 commit comments

Comments
 (0)