From f5aa704ed471c25717c83ac89567431ee3adb641 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 11 Dec 2025 13:42:51 -0800 Subject: [PATCH] Update to Alpine 3.23 --- 3.13/alpine/Dockerfile | 4 ++-- 4.0/alpine/Dockerfile | 4 ++-- 4.1/alpine/Dockerfile | 4 ++-- 4.2/alpine/Dockerfile | 4 ++-- versions.json | 8 ++++---- versions.sh | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/3.13/alpine/Dockerfile b/3.13/alpine/Dockerfile index 73f9af56..0050b7f7 100644 --- a/3.13/alpine/Dockerfile +++ b/3.13/alpine/Dockerfile @@ -8,7 +8,7 @@ # vim:noet: # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! -FROM alpine:3.22 AS build-base +FROM alpine:3.23 AS build-base RUN apk add --no-cache \ build-base \ @@ -196,7 +196,7 @@ ENV PATH=$ERLANG_INSTALL_PATH_PREFIX/bin:$PATH RUN find $ERLANG_INSTALL_PATH_PREFIX -type f -name 'crypto.so' -exec ldd {} \; | awk '/libcrypto\.so/ { if (!index($3,ENVIRON["OPENSSL_INSTALL_PATH_PREFIX"])) exit 1 }' RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().' -FROM alpine:3.22 +FROM alpine:3.23 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again ENV ERLANG_INSTALL_PATH_PREFIX=/opt/erlang diff --git a/4.0/alpine/Dockerfile b/4.0/alpine/Dockerfile index f69e3cb8..9113b73d 100644 --- a/4.0/alpine/Dockerfile +++ b/4.0/alpine/Dockerfile @@ -8,7 +8,7 @@ # vim:noet: # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! -FROM alpine:3.22 AS build-base +FROM alpine:3.23 AS build-base RUN apk add --no-cache \ build-base \ @@ -196,7 +196,7 @@ ENV PATH=$ERLANG_INSTALL_PATH_PREFIX/bin:$PATH RUN find $ERLANG_INSTALL_PATH_PREFIX -type f -name 'crypto.so' -exec ldd {} \; | awk '/libcrypto\.so/ { if (!index($3,ENVIRON["OPENSSL_INSTALL_PATH_PREFIX"])) exit 1 }' RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().' -FROM alpine:3.22 +FROM alpine:3.23 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again ENV ERLANG_INSTALL_PATH_PREFIX=/opt/erlang diff --git a/4.1/alpine/Dockerfile b/4.1/alpine/Dockerfile index ebb08b3c..951f5bd1 100644 --- a/4.1/alpine/Dockerfile +++ b/4.1/alpine/Dockerfile @@ -8,7 +8,7 @@ # vim:noet: # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! -FROM alpine:3.22 AS build-base +FROM alpine:3.23 AS build-base RUN apk add --no-cache \ build-base \ @@ -196,7 +196,7 @@ ENV PATH=$ERLANG_INSTALL_PATH_PREFIX/bin:$PATH RUN find $ERLANG_INSTALL_PATH_PREFIX -type f -name 'crypto.so' -exec ldd {} \; | awk '/libcrypto\.so/ { if (!index($3,ENVIRON["OPENSSL_INSTALL_PATH_PREFIX"])) exit 1 }' RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().' -FROM alpine:3.22 +FROM alpine:3.23 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again ENV ERLANG_INSTALL_PATH_PREFIX=/opt/erlang diff --git a/4.2/alpine/Dockerfile b/4.2/alpine/Dockerfile index 1daf6dfd..4dd09516 100644 --- a/4.2/alpine/Dockerfile +++ b/4.2/alpine/Dockerfile @@ -8,7 +8,7 @@ # vim:noet: # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! -FROM alpine:3.22 AS build-base +FROM alpine:3.23 AS build-base RUN apk add --no-cache \ build-base \ @@ -196,7 +196,7 @@ ENV PATH=$ERLANG_INSTALL_PATH_PREFIX/bin:$PATH RUN find $ERLANG_INSTALL_PATH_PREFIX -type f -name 'crypto.so' -exec ldd {} \; | awk '/libcrypto\.so/ { if (!index($3,ENVIRON["OPENSSL_INSTALL_PATH_PREFIX"])) exit 1 }' RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().' -FROM alpine:3.22 +FROM alpine:3.23 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again ENV ERLANG_INSTALL_PATH_PREFIX=/opt/erlang diff --git a/versions.json b/versions.json index 05062127..3bc1fa31 100644 --- a/versions.json +++ b/versions.json @@ -1,7 +1,7 @@ { "3.13": { "alpine": { - "version": "3.22" + "version": "3.23" }, "openssl": { "sha256": "d319da6aecde3aa6f426b44bbf997406d95275c5c59ab6f6ef53caaa079f456f", @@ -32,7 +32,7 @@ "3.13-rc": null, "4.0": { "alpine": { - "version": "3.22" + "version": "3.23" }, "openssl": { "sha256": "967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99", @@ -63,7 +63,7 @@ "4.0-rc": null, "4.1": { "alpine": { - "version": "3.22" + "version": "3.23" }, "openssl": { "sha256": "967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99", @@ -94,7 +94,7 @@ "4.1-rc": null, "4.2": { "alpine": { - "version": "3.22" + "version": "3.23" }, "openssl": { "sha256": "967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99", diff --git a/versions.sh b/versions.sh index e3fd1722..0292b85e 100755 --- a/versions.sh +++ b/versions.sh @@ -3,10 +3,10 @@ set -Eeuo pipefail declare -A alpineVersions=( - [3.13]='3.22' - [4.0]='3.22' - [4.1]='3.22' - [4.2]='3.22' + [3.13]='3.23' + [4.0]='3.23' + [4.1]='3.23' + [4.2]='3.23' ) declare -A ubuntuVersions=(