From e6c8ca467d3535bed9edd6c1e6a81ca1f07c2f0e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 26 May 2021 10:30:28 -0700 Subject: [PATCH] Update to Erlang 24 --- 3.8-rc/alpine/Dockerfile | 5 ++--- 3.8-rc/ubuntu/Dockerfile | 5 ++--- 3.8/alpine/Dockerfile | 5 ++--- 3.8/ubuntu/Dockerfile | 5 ++--- Dockerfile-alpine.template | 1 - Dockerfile-ubuntu.template | 1 - versions.json | 8 ++++---- versions.sh | 2 +- 8 files changed, 13 insertions(+), 19 deletions(-) diff --git a/3.8-rc/alpine/Dockerfile b/3.8-rc/alpine/Dockerfile index c635d820..31e6e112 100644 --- a/3.8-rc/alpine/Dockerfile +++ b/3.8-rc/alpine/Dockerfile @@ -26,10 +26,10 @@ ENV OPENSSL_SOURCE_SHA256="892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c32 # https://www.openssl.org/community/omc.html ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" -ENV OTP_VERSION 23.3.4.1 +ENV OTP_VERSION 24.0.1 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system # https://erlang.org/pipermail/erlang-questions/2019-January/097067.html -ENV OTP_SOURCE_SHA256="ec2998933ff634552b3daadd85c1cf9b93abb06497e3722c9b1596b2f7931bd9" +ENV OTP_SOURCE_SHA256="e69bfaf8431252944ae87e7f031ef174ccdf61336334e70770af397d80ea7a6b" # Install dependencies required to build Erlang/OTP from source # https://erlang.org/doc/installation_guide/INSTALL.html @@ -135,7 +135,6 @@ RUN set -eux; \ --without-diameter \ --without-edoc \ --without-erl_docgen \ - --without-erl_interface \ --without-et \ --without-eunit \ --without-ftp \ diff --git a/3.8-rc/ubuntu/Dockerfile b/3.8-rc/ubuntu/Dockerfile index 910610f1..32a8e912 100644 --- a/3.8-rc/ubuntu/Dockerfile +++ b/3.8-rc/ubuntu/Dockerfile @@ -29,10 +29,10 @@ ENV OPENSSL_SOURCE_SHA256="892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c32 # https://www.openssl.org/community/omc.html ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" -ENV OTP_VERSION 23.3.4.1 +ENV OTP_VERSION 24.0.1 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system # https://erlang.org/pipermail/erlang-questions/2019-January/097067.html -ENV OTP_SOURCE_SHA256="ec2998933ff634552b3daadd85c1cf9b93abb06497e3722c9b1596b2f7931bd9" +ENV OTP_SOURCE_SHA256="e69bfaf8431252944ae87e7f031ef174ccdf61336334e70770af397d80ea7a6b" # Install dependencies required to build Erlang/OTP from source # https://erlang.org/doc/installation_guide/INSTALL.html @@ -142,7 +142,6 @@ RUN set -eux; \ --without-diameter \ --without-edoc \ --without-erl_docgen \ - --without-erl_interface \ --without-et \ --without-eunit \ --without-ftp \ diff --git a/3.8/alpine/Dockerfile b/3.8/alpine/Dockerfile index 39df2d32..a958d9b5 100644 --- a/3.8/alpine/Dockerfile +++ b/3.8/alpine/Dockerfile @@ -26,10 +26,10 @@ ENV OPENSSL_SOURCE_SHA256="892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c32 # https://www.openssl.org/community/omc.html ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" -ENV OTP_VERSION 23.3.4.1 +ENV OTP_VERSION 24.0.1 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system # https://erlang.org/pipermail/erlang-questions/2019-January/097067.html -ENV OTP_SOURCE_SHA256="ec2998933ff634552b3daadd85c1cf9b93abb06497e3722c9b1596b2f7931bd9" +ENV OTP_SOURCE_SHA256="e69bfaf8431252944ae87e7f031ef174ccdf61336334e70770af397d80ea7a6b" # Install dependencies required to build Erlang/OTP from source # https://erlang.org/doc/installation_guide/INSTALL.html @@ -135,7 +135,6 @@ RUN set -eux; \ --without-diameter \ --without-edoc \ --without-erl_docgen \ - --without-erl_interface \ --without-et \ --without-eunit \ --without-ftp \ diff --git a/3.8/ubuntu/Dockerfile b/3.8/ubuntu/Dockerfile index 84f16a62..05dc0b08 100644 --- a/3.8/ubuntu/Dockerfile +++ b/3.8/ubuntu/Dockerfile @@ -29,10 +29,10 @@ ENV OPENSSL_SOURCE_SHA256="892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c32 # https://www.openssl.org/community/omc.html ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" -ENV OTP_VERSION 23.3.4.1 +ENV OTP_VERSION 24.0.1 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system # https://erlang.org/pipermail/erlang-questions/2019-January/097067.html -ENV OTP_SOURCE_SHA256="ec2998933ff634552b3daadd85c1cf9b93abb06497e3722c9b1596b2f7931bd9" +ENV OTP_SOURCE_SHA256="e69bfaf8431252944ae87e7f031ef174ccdf61336334e70770af397d80ea7a6b" # Install dependencies required to build Erlang/OTP from source # https://erlang.org/doc/installation_guide/INSTALL.html @@ -142,7 +142,6 @@ RUN set -eux; \ --without-diameter \ --without-edoc \ --without-erl_docgen \ - --without-erl_interface \ --without-et \ --without-eunit \ --without-ftp \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 32fd14c4..3cf5c6c7 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -151,7 +151,6 @@ RUN set -eux; \ --without-diameter \ --without-edoc \ --without-erl_docgen \ - --without-erl_interface \ --without-et \ --without-eunit \ --without-ftp \ diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template index ed1bb426..ef8dc9ea 100644 --- a/Dockerfile-ubuntu.template +++ b/Dockerfile-ubuntu.template @@ -158,7 +158,6 @@ RUN set -eux; \ --without-diameter \ --without-edoc \ --without-erl_docgen \ - --without-erl_interface \ --without-et \ --without-eunit \ --without-ftp \ diff --git a/versions.json b/versions.json index 4c2ecb79..0c2fe499 100644 --- a/versions.json +++ b/versions.json @@ -5,8 +5,8 @@ "version": "1.1.1k" }, "otp": { - "sha256": "ec2998933ff634552b3daadd85c1cf9b93abb06497e3722c9b1596b2f7931bd9", - "version": "23.3.4.1" + "sha256": "e69bfaf8431252944ae87e7f031ef174ccdf61336334e70770af397d80ea7a6b", + "version": "24.0.1" }, "version": "3.8.16" }, @@ -16,8 +16,8 @@ "version": "1.1.1k" }, "otp": { - "sha256": "ec2998933ff634552b3daadd85c1cf9b93abb06497e3722c9b1596b2f7931bd9", - "version": "23.3.4.1" + "sha256": "e69bfaf8431252944ae87e7f031ef174ccdf61336334e70770af397d80ea7a6b", + "version": "24.0.1" }, "version": "3.8.15-rc.3" } diff --git a/versions.sh b/versions.sh index a0552772..8c51ec11 100755 --- a/versions.sh +++ b/versions.sh @@ -3,7 +3,7 @@ set -Eeuo pipefail # https://www.rabbitmq.com/which-erlang.html ("Maximum supported Erlang/OTP") declare -A otpMajors=( - [3.8]='23' + [3.8]='24' ) # https://www.openssl.org/policies/releasestrat.html