From 12f3bdce892e410cc190dc4f3a4d9a405f478b23 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 2 Aug 2022 16:05:21 -0700 Subject: [PATCH] Bump 3.10.x to use erlang 25 --- 3.10/alpine/Dockerfile | 4 ++-- 3.10/ubuntu/Dockerfile | 4 ++-- versions.json | 4 ++-- versions.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/3.10/alpine/Dockerfile b/3.10/alpine/Dockerfile index b5b7b0d6..a942252c 100644 --- a/3.10/alpine/Dockerfile +++ b/3.10/alpine/Dockerfile @@ -28,10 +28,10 @@ ENV OPENSSL_SOURCE_SHA256="d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51 # https://www.openssl.org/community/omc.html ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" -ENV OTP_VERSION 24.3.4.2 +ENV OTP_VERSION 25.0.3 # 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="0376d50f867a29426d47600056e8cc49c95b51ef172b6b9030628e35aecd46af" +ENV OTP_SOURCE_SHA256="0d7558bc16f3e6b61964521e0157e1a75aad1770bb08af10366ea4c83441ec28" # Install dependencies required to build Erlang/OTP from source # https://erlang.org/doc/installation_guide/INSTALL.html diff --git a/3.10/ubuntu/Dockerfile b/3.10/ubuntu/Dockerfile index 29188047..c7b16845 100644 --- a/3.10/ubuntu/Dockerfile +++ b/3.10/ubuntu/Dockerfile @@ -31,10 +31,10 @@ ENV OPENSSL_SOURCE_SHA256="d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51 # https://www.openssl.org/community/omc.html ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" -ENV OTP_VERSION 24.3.4.2 +ENV OTP_VERSION 25.0.3 # 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="0376d50f867a29426d47600056e8cc49c95b51ef172b6b9030628e35aecd46af" +ENV OTP_SOURCE_SHA256="0d7558bc16f3e6b61964521e0157e1a75aad1770bb08af10366ea4c83441ec28" # Install dependencies required to build Erlang/OTP from source # https://erlang.org/doc/installation_guide/INSTALL.html diff --git a/versions.json b/versions.json index 52a01386..b0d5e7ba 100644 --- a/versions.json +++ b/versions.json @@ -5,8 +5,8 @@ "version": "1.1.1q" }, "otp": { - "sha256": "0376d50f867a29426d47600056e8cc49c95b51ef172b6b9030628e35aecd46af", - "version": "24.3.4.2" + "sha256": "0d7558bc16f3e6b61964521e0157e1a75aad1770bb08af10366ea4c83441ec28", + "version": "25.0.3" }, "version": "3.10.7" }, diff --git a/versions.sh b/versions.sh index 1c888218..2cf5480f 100755 --- a/versions.sh +++ b/versions.sh @@ -4,7 +4,7 @@ set -Eeuo pipefail # https://www.rabbitmq.com/which-erlang.html ("Maximum supported Erlang/OTP") declare -A otpMajors=( [3.9]='24' - [3.10]='24' + [3.10]='25' ) # https://www.openssl.org/policies/releasestrat.html