From 0584c9d30e14c060a7fb677c5134f03da0d6a68d Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Thu, 12 Dec 2024 16:49:14 -0800
Subject: [PATCH] Update to Alpine 3.21

---
 3.13/alpine/Dockerfile   | 4 ++--
 4.0/alpine/Dockerfile    | 4 ++--
 4.1-rc/alpine/Dockerfile | 4 ++--
 versions.json            | 6 +++---
 versions.sh              | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/3.13/alpine/Dockerfile b/3.13/alpine/Dockerfile
index 4dbacc06..6ebb602b 100644
--- a/3.13/alpine/Dockerfile
+++ b/3.13/alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.20 as build-base
+FROM alpine:3.21 as build-base
 
 RUN apk add --no-cache \
 	build-base \
@@ -192,7 +192,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.20
+FROM alpine:3.21
 
 # 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 866006fa..99b2db2b 100644
--- a/4.0/alpine/Dockerfile
+++ b/4.0/alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.20 as build-base
+FROM alpine:3.21 as build-base
 
 RUN apk add --no-cache \
 	build-base \
@@ -192,7 +192,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.20
+FROM alpine:3.21
 
 # 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-rc/alpine/Dockerfile b/4.1-rc/alpine/Dockerfile
index 5077b6e3..c62419ff 100644
--- a/4.1-rc/alpine/Dockerfile
+++ b/4.1-rc/alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.20 as build-base
+FROM alpine:3.21 as build-base
 
 RUN apk add --no-cache \
 	build-base \
@@ -192,7 +192,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.20
+FROM alpine:3.21
 
 # 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 e28b6aee..55cfdfc7 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
 {
   "3.13": {
     "alpine": {
-      "version": "3.20"
+      "version": "3.21"
     },
     "openssl": {
       "sha256": "053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c",
@@ -19,7 +19,7 @@
   "3.13-rc": null,
   "4.0": {
     "alpine": {
-      "version": "3.20"
+      "version": "3.21"
     },
     "openssl": {
       "sha256": "2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281",
@@ -37,7 +37,7 @@
   "4.0-rc": null,
   "4.1-rc": {
     "alpine": {
-      "version": "3.20"
+      "version": "3.21"
     },
     "openssl": {
       "sha256": "2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281",
diff --git a/versions.sh b/versions.sh
index 465c8aa1..16cb60cd 100755
--- a/versions.sh
+++ b/versions.sh
@@ -2,9 +2,9 @@
 set -Eeuo pipefail
 
 declare -A alpineVersions=(
-	[3.13]='3.20'
-	[4.0]='3.20'
-	[4.1]='3.20'
+	[3.13]='3.21'
+	[4.0]='3.21'
+	[4.1]='3.21'
 )
 
 declare -A ubuntuVersions=(