diff --git a/3.13/ubuntu/Dockerfile b/3.13/ubuntu/Dockerfile index afd27531..58c50b66 100644 --- a/3.13/ubuntu/Dockerfile +++ b/3.13/ubuntu/Dockerfile @@ -6,7 +6,7 @@ # The official Canonical Ubuntu Focal image is ideal from a security perspective, # especially for the enterprises that we, the RabbitMQ team, have to deal with -FROM ubuntu:22.04 as build-base +FROM ubuntu:24.04 as build-base ARG BUILDKIT_SBOM_SCAN_STAGE=true @@ -199,7 +199,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 ubuntu:22.04 +FROM ubuntu:24.04 # 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 55cfdfc7..6bd99095 100644 --- a/versions.json +++ b/versions.json @@ -12,7 +12,7 @@ "version": "26.2.5.6" }, "ubuntu": { - "version": "22.04" + "version": "24.04" }, "version": "3.13.7" }, diff --git a/versions.sh b/versions.sh index 16cb60cd..8b46b254 100755 --- a/versions.sh +++ b/versions.sh @@ -8,7 +8,7 @@ declare -A alpineVersions=( ) declare -A ubuntuVersions=( - [3.13]='22.04' + [3.13]='24.04' [4.0]='24.04' [4.1]='24.04' )