Merge pull request #744 from infosiftr/alpine3.21

Update to Alpine 3.21
This commit is contained in:
Laurent Goderre 2024-12-13 09:53:51 -05:00 committed by GitHub
commit f792f9255c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 12 deletions

View File

@ -5,7 +5,7 @@
# #
# Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! # 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 \ RUN apk add --no-cache \
build-base \ 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 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().' 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 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang

4
4.0/alpine/Dockerfile generated
View File

@ -5,7 +5,7 @@
# #
# Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! # 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 \ RUN apk add --no-cache \
build-base \ 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 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().' 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 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang

View File

@ -5,7 +5,7 @@
# #
# Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! # 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 \ RUN apk add --no-cache \
build-base \ 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 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().' 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 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang

View File

@ -1,7 +1,7 @@
{ {
"3.13": { "3.13": {
"alpine": { "alpine": {
"version": "3.20" "version": "3.21"
}, },
"openssl": { "openssl": {
"sha256": "053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c", "sha256": "053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c",
@ -19,7 +19,7 @@
"3.13-rc": null, "3.13-rc": null,
"4.0": { "4.0": {
"alpine": { "alpine": {
"version": "3.20" "version": "3.21"
}, },
"openssl": { "openssl": {
"sha256": "2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281", "sha256": "2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281",
@ -37,7 +37,7 @@
"4.0-rc": null, "4.0-rc": null,
"4.1-rc": { "4.1-rc": {
"alpine": { "alpine": {
"version": "3.20" "version": "3.21"
}, },
"openssl": { "openssl": {
"sha256": "2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281", "sha256": "2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281",

View File

@ -2,9 +2,9 @@
set -Eeuo pipefail set -Eeuo pipefail
declare -A alpineVersions=( declare -A alpineVersions=(
[3.13]='3.20' [3.13]='3.21'
[4.0]='3.20' [4.0]='3.21'
[4.1]='3.20' [4.1]='3.21'
) )
declare -A ubuntuVersions=( declare -A ubuntuVersions=(