Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ruby #15868

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Update ruby #15868

merged 1 commit into from
Dec 8, 2023

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 8, 2023

Changes:

Changes:

- docker-library/ruby@96b95ba: Merge pull request docker-library/ruby#433 from Earlopain/alpine-3.19
- docker-library/ruby@423e364: Bump rust version
- docker-library/ruby@61a8069: Add alpine 3.19
Copy link

github-actions bot commented Dec 8, 2023

Diff for 5d87bf6:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 619ba11..2592e0b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -26,15 +26,15 @@ Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
 Directory: 3.0/slim-buster
 
-Tags: 3.1.4-alpine3.17, 3.1-alpine3.17
+Tags: 3.1.4-alpine3.18, 3.1-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
-Directory: 3.1/alpine3.17
+Directory: 3.1/alpine3.18
 
-Tags: 3.1.4-alpine3.18, 3.1-alpine3.18, 3.1.4-alpine, 3.1-alpine
+Tags: 3.1.4-alpine3.19, 3.1-alpine3.19, 3.1.4-alpine, 3.1-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
-Directory: 3.1/alpine3.18
+GitCommit: 61a806938da52038916a8fd7b9b4373937bdc28f
+Directory: 3.1/alpine3.19
 
 Tags: 3.1.4-bookworm, 3.1-bookworm, 3.1.4, 3.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -56,62 +56,62 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
 Directory: 3.1/slim-bullseye
 
-Tags: 3.2.2-alpine3.17, 3.2-alpine3.17, 3-alpine3.17, alpine3.17
+Tags: 3.2.2-alpine3.18, 3.2-alpine3.18, 3-alpine3.18, alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
-Directory: 3.2/alpine3.17
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
+Directory: 3.2/alpine3.18
 
-Tags: 3.2.2-alpine3.18, 3.2-alpine3.18, 3-alpine3.18, alpine3.18, 3.2.2-alpine, 3.2-alpine, 3-alpine, alpine
+Tags: 3.2.2-alpine3.19, 3.2-alpine3.19, 3-alpine3.19, alpine3.19, 3.2.2-alpine, 3.2-alpine, 3-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b
-Directory: 3.2/alpine3.18
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
+Directory: 3.2/alpine3.19
 
 Tags: 3.2.2-bookworm, 3.2-bookworm, 3-bookworm, bookworm, 3.2.2, 3.2, 3, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
 Directory: 3.2/bookworm
 
 Tags: 3.2.2-bullseye, 3.2-bullseye, 3-bullseye, bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
 Directory: 3.2/bullseye
 
 Tags: 3.2.2-slim-bookworm, 3.2-slim-bookworm, 3-slim-bookworm, slim-bookworm, 3.2.2-slim, 3.2-slim, 3-slim, slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
 Directory: 3.2/slim-bookworm
 
 Tags: 3.2.2-slim-bullseye, 3.2-slim-bullseye, 3-slim-bullseye, slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ed1be47a38a7a24a0aa03c450549afcb592f02a8
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
 Directory: 3.2/slim-bullseye
 
-Tags: 3.3.0-preview3-alpine3.17, 3.3-rc-alpine3.17
+Tags: 3.3.0-preview3-alpine3.18, 3.3-rc-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 897d5b47686172a3ad13fd6ddc48f6eaabf151c7
-Directory: 3.3-rc/alpine3.17
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
+Directory: 3.3-rc/alpine3.18
 
-Tags: 3.3.0-preview3-alpine3.18, 3.3-rc-alpine3.18, 3.3.0-preview3-alpine, 3.3-rc-alpine
+Tags: 3.3.0-preview3-alpine3.19, 3.3-rc-alpine3.19, 3.3.0-preview3-alpine, 3.3-rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 897d5b47686172a3ad13fd6ddc48f6eaabf151c7
-Directory: 3.3-rc/alpine3.18
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
+Directory: 3.3-rc/alpine3.19
 
 Tags: 3.3.0-preview3-bookworm, 3.3-rc-bookworm, 3.3.0-preview3, 3.3-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 897d5b47686172a3ad13fd6ddc48f6eaabf151c7
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
 Directory: 3.3-rc/bookworm
 
 Tags: 3.3.0-preview3-bullseye, 3.3-rc-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 897d5b47686172a3ad13fd6ddc48f6eaabf151c7
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
 Directory: 3.3-rc/bullseye
 
 Tags: 3.3.0-preview3-slim-bookworm, 3.3-rc-slim-bookworm, 3.3.0-preview3-slim, 3.3-rc-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 897d5b47686172a3ad13fd6ddc48f6eaabf151c7
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
 Directory: 3.3-rc/slim-bookworm
 
 Tags: 3.3.0-preview3-slim-bullseye, 3.3-rc-slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 897d5b47686172a3ad13fd6ddc48f6eaabf151c7
+GitCommit: 423e364cd1681dac6b5afd6191d774aaa1cf6161
 Directory: 3.3-rc/slim-bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index d1769e0..2c63923 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 ruby:3
 ruby:3-alpine
-ruby:3-alpine3.17
 ruby:3-alpine3.18
+ruby:3-alpine3.19
 ruby:3-bookworm
 ruby:3-bullseye
 ruby:3-slim
@@ -25,8 +25,8 @@ ruby:3.0.6-slim-bullseye
 ruby:3.0.6-slim-buster
 ruby:3.1
 ruby:3.1-alpine
-ruby:3.1-alpine3.17
 ruby:3.1-alpine3.18
+ruby:3.1-alpine3.19
 ruby:3.1-bookworm
 ruby:3.1-bullseye
 ruby:3.1-slim
@@ -34,8 +34,8 @@ ruby:3.1-slim-bookworm
 ruby:3.1-slim-bullseye
 ruby:3.1.4
 ruby:3.1.4-alpine
-ruby:3.1.4-alpine3.17
 ruby:3.1.4-alpine3.18
+ruby:3.1.4-alpine3.19
 ruby:3.1.4-bookworm
 ruby:3.1.4-bullseye
 ruby:3.1.4-slim
@@ -43,8 +43,8 @@ ruby:3.1.4-slim-bookworm
 ruby:3.1.4-slim-bullseye
 ruby:3.2
 ruby:3.2-alpine
-ruby:3.2-alpine3.17
 ruby:3.2-alpine3.18
+ruby:3.2-alpine3.19
 ruby:3.2-bookworm
 ruby:3.2-bullseye
 ruby:3.2-slim
@@ -52,8 +52,8 @@ ruby:3.2-slim-bookworm
 ruby:3.2-slim-bullseye
 ruby:3.2.2
 ruby:3.2.2-alpine
-ruby:3.2.2-alpine3.17
 ruby:3.2.2-alpine3.18
+ruby:3.2.2-alpine3.19
 ruby:3.2.2-bookworm
 ruby:3.2.2-bullseye
 ruby:3.2.2-slim
@@ -61,8 +61,8 @@ ruby:3.2.2-slim-bookworm
 ruby:3.2.2-slim-bullseye
 ruby:3.3-rc
 ruby:3.3-rc-alpine
-ruby:3.3-rc-alpine3.17
 ruby:3.3-rc-alpine3.18
+ruby:3.3-rc-alpine3.19
 ruby:3.3-rc-bookworm
 ruby:3.3-rc-bullseye
 ruby:3.3-rc-slim
@@ -70,16 +70,16 @@ ruby:3.3-rc-slim-bookworm
 ruby:3.3-rc-slim-bullseye
 ruby:3.3.0-preview3
 ruby:3.3.0-preview3-alpine
-ruby:3.3.0-preview3-alpine3.17
 ruby:3.3.0-preview3-alpine3.18
+ruby:3.3.0-preview3-alpine3.19
 ruby:3.3.0-preview3-bookworm
 ruby:3.3.0-preview3-bullseye
 ruby:3.3.0-preview3-slim
 ruby:3.3.0-preview3-slim-bookworm
 ruby:3.3.0-preview3-slim-bullseye
 ruby:alpine
-ruby:alpine3.17
 ruby:alpine3.18
+ruby:alpine3.19
 ruby:bookworm
 ruby:bullseye
 ruby:latest
diff --git a/ruby_3.1-alpine/Dockerfile b/ruby_3.1-alpine/Dockerfile
index 4bc3519..d5b4dbc 100644
--- a/ruby_3.1-alpine/Dockerfile
+++ b/ruby_3.1-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 RUN set -eux; \
 	apk add --no-cache \
diff --git a/ruby_3.1-alpine3.17/Dockerfile b/ruby_3.1-alpine3.17/Dockerfile
deleted file mode 100644
index 2524ac4..0000000
diff --git a/ruby_3.1-alpine/Dockerfile b/ruby_3.1-alpine3.18/Dockerfile
similarity index 100%
copy from ruby_3.1-alpine/Dockerfile
copy to ruby_3.1-alpine3.18/Dockerfile
diff --git a/ruby_3.3-rc-alpine/Dockerfile b/ruby_3.3-rc-alpine/Dockerfile
index fe6842c..9bacaf1 100644
--- a/ruby_3.3-rc-alpine/Dockerfile
+++ b/ruby_3.3-rc-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 RUN set -eux; \
 	apk add --no-cache \
@@ -67,8 +67,8 @@ RUN set -eux; \
 	rustArch=; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \
-		'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \
+		'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \
+		'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -80,7 +80,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_3.3-rc-alpine3.17/Dockerfile b/ruby_3.3-rc-alpine3.18/Dockerfile
similarity index 91%
rename from ruby_3.3-rc-alpine3.17/Dockerfile
rename to ruby_3.3-rc-alpine3.18/Dockerfile
index b1c0d16..1e2ea36 100644
--- a/ruby_3.3-rc-alpine3.17/Dockerfile
+++ b/ruby_3.3-rc-alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 RUN set -eux; \
 	apk add --no-cache \
@@ -67,8 +67,8 @@ RUN set -eux; \
 	rustArch=; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \
-		'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \
+		'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \
+		'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -80,7 +80,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_3.3-rc-bullseye/Dockerfile b/ruby_3.3-rc-bullseye/Dockerfile
index 4d3a023..090343d 100644
--- a/ruby_3.3-rc-bullseye/Dockerfile
+++ b/ruby_3.3-rc-bullseye/Dockerfile
@@ -36,8 +36,8 @@ RUN set -eux; \
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \
-		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \
+		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \
+		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -49,7 +49,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_3.3-rc-slim-bullseye/Dockerfile b/ruby_3.3-rc-slim-bullseye/Dockerfile
index fbd06f7..602e952 100644
--- a/ruby_3.3-rc-slim-bullseye/Dockerfile
+++ b/ruby_3.3-rc-slim-bullseye/Dockerfile
@@ -62,8 +62,8 @@ RUN set -eux; \
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \
-		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \
+		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \
+		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -75,7 +75,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_3.3-rc-slim/Dockerfile b/ruby_3.3-rc-slim/Dockerfile
index a50cfca..a38c85f 100644
--- a/ruby_3.3-rc-slim/Dockerfile
+++ b/ruby_3.3-rc-slim/Dockerfile
@@ -62,8 +62,8 @@ RUN set -eux; \
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \
-		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \
+		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \
+		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -75,7 +75,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_3.3-rc/Dockerfile b/ruby_3.3-rc/Dockerfile
index 730b407..37458ff 100644
--- a/ruby_3.3-rc/Dockerfile
+++ b/ruby_3.3-rc/Dockerfile
@@ -36,8 +36,8 @@ RUN set -eux; \
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \
-		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \
+		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \
+		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -49,7 +49,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_alpine/Dockerfile b/ruby_alpine/Dockerfile
index 86d177b..f5dfda1 100644
--- a/ruby_alpine/Dockerfile
+++ b/ruby_alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 RUN set -eux; \
 	apk add --no-cache \
@@ -68,8 +68,8 @@ RUN set -eux; \
 	rustArch=; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \
-		'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \
+		'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \
+		'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -81,7 +81,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_alpine3.17/Dockerfile b/ruby_alpine3.18/Dockerfile
similarity index 91%
rename from ruby_alpine3.17/Dockerfile
rename to ruby_alpine3.18/Dockerfile
index 86daae5..b80ebd3 100644
--- a/ruby_alpine3.17/Dockerfile
+++ b/ruby_alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.17
+FROM alpine:3.18
 
 RUN set -eux; \
 	apk add --no-cache \
@@ -68,8 +68,8 @@ RUN set -eux; \
 	rustArch=; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \
-		'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \
+		'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \
+		'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -81,7 +81,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_bullseye/Dockerfile b/ruby_bullseye/Dockerfile
index d4d54ff..273e0b6 100644
--- a/ruby_bullseye/Dockerfile
+++ b/ruby_bullseye/Dockerfile
@@ -36,8 +36,8 @@ RUN set -eux; \
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \
-		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \
+		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \
+		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -49,7 +49,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_latest/Dockerfile b/ruby_latest/Dockerfile
index b56f1ce..522d36d 100644
--- a/ruby_latest/Dockerfile
+++ b/ruby_latest/Dockerfile
@@ -36,8 +36,8 @@ RUN set -eux; \
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \
-		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \
+		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \
+		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -49,7 +49,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_slim-bullseye/Dockerfile b/ruby_slim-bullseye/Dockerfile
index 775022a..363ec92 100644
--- a/ruby_slim-bullseye/Dockerfile
+++ b/ruby_slim-bullseye/Dockerfile
@@ -63,8 +63,8 @@ RUN set -eux; \
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \
-		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \
+		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \
+		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -76,7 +76,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \
diff --git a/ruby_slim/Dockerfile b/ruby_slim/Dockerfile
index 9adf74d..c618e9a 100644
--- a/ruby_slim/Dockerfile
+++ b/ruby_slim/Dockerfile
@@ -63,8 +63,8 @@ RUN set -eux; \
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \
-		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \
+		'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \
+		'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \
 	esac; \
 	\
 	if [ -n "$rustArch" ]; then \
@@ -76,7 +76,7 @@ RUN set -eux; \
 		\
 		export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \
 		export PATH="$CARGO_HOME/bin:$PATH"; \
-		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \
+		/tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \
 		\
 		rustc --version; \
 		cargo --version; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 479aede into docker-library:master Dec 8, 2023
28 checks passed
@yosifkit yosifkit deleted the ruby branch December 8, 2023 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants