Bump erlang

And revert erlang patch backports
This commit is contained in:
Joseph Ferguson 2025-01-28 13:27:16 -08:00
parent dd27cf720c
commit a6e24f2c3c
8 changed files with 18 additions and 38 deletions

View File

@ -31,10 +31,10 @@ ENV OPENSSL_SOURCE_SHA256="053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751a
# https://www.openssl.org/source/ # https://www.openssl.org/source/
ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF" ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
ENV OTP_VERSION 26.2.5.6 ENV OTP_VERSION 26.2.5.7
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system # 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 # https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
ENV OTP_SOURCE_SHA256="96ce3340450756fdabf8fdb2e3ceb0489eb679f6b51b7b7ac6417c2e6f495bb8" ENV OTP_SOURCE_SHA256="49afee0ae2c5f9537c4c433caf1ae6d04d8b2cf74aa92c50f133d9feebdf1036"
# install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages # install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang
@ -127,11 +127,6 @@ RUN set -eux; \
echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \ echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \
tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \ tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
\ \
# https://github.com/erlang/otp/pull/9212
wget --output-document otp-9212.patch 'https://github.com/erlang/otp/commit/e2604aa7a92b3bb7c1293afd12705c7ce9c952a4.patch?full_index=1'; \
echo '35ec51529bdd6cab4b173b4e1fe844efa82f74eba76a99a74f746778d64dffa7 *otp-9212.patch' | sha256sum -c -; \
patch --input="$PWD/otp-9212.patch" --directory="$OTP_PATH" --strip=1; \
\
# Configure Erlang/OTP for compilation, disable unused features & applications # Configure Erlang/OTP for compilation, disable unused features & applications
# https://erlang.org/doc/applications.html # https://erlang.org/doc/applications.html
# ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation

View File

@ -34,10 +34,10 @@ ENV OPENSSL_SOURCE_SHA256="053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751a
# https://www.openssl.org/source/ # https://www.openssl.org/source/
ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF" ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
ENV OTP_VERSION 26.2.5.6 ENV OTP_VERSION 26.2.5.7
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system # 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 # https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
ENV OTP_SOURCE_SHA256="96ce3340450756fdabf8fdb2e3ceb0489eb679f6b51b7b7ac6417c2e6f495bb8" ENV OTP_SOURCE_SHA256="49afee0ae2c5f9537c4c433caf1ae6d04d8b2cf74aa92c50f133d9feebdf1036"
# install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages # install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang

9
4.0/alpine/Dockerfile generated
View File

@ -31,10 +31,10 @@ ENV OPENSSL_SOURCE_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da11
# https://www.openssl.org/source/ # https://www.openssl.org/source/
ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF" ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
ENV OTP_VERSION 27.2 ENV OTP_VERSION 27.2.1
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system # 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 # https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
ENV OTP_SOURCE_SHA256="b66c2cc4fa2c87211b668e4486d4f3e5b1b6705698873ea3e6d9850801ac992d" ENV OTP_SOURCE_SHA256="07982134e10637dde57cf9cdc6dda6f65425810229986136d184766d4db9eda3"
# install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages # install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang
@ -127,11 +127,6 @@ RUN set -eux; \
echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \ echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \
tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \ tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
\ \
# https://github.com/erlang/otp/pull/9212
wget --output-document otp-9212.patch 'https://github.com/erlang/otp/commit/e2604aa7a92b3bb7c1293afd12705c7ce9c952a4.patch?full_index=1'; \
echo '35ec51529bdd6cab4b173b4e1fe844efa82f74eba76a99a74f746778d64dffa7 *otp-9212.patch' | sha256sum -c -; \
patch --input="$PWD/otp-9212.patch" --directory="$OTP_PATH" --strip=1; \
\
# Configure Erlang/OTP for compilation, disable unused features & applications # Configure Erlang/OTP for compilation, disable unused features & applications
# https://erlang.org/doc/applications.html # https://erlang.org/doc/applications.html
# ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation

4
4.0/ubuntu/Dockerfile generated
View File

@ -34,10 +34,10 @@ ENV OPENSSL_SOURCE_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da11
# https://www.openssl.org/source/ # https://www.openssl.org/source/
ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF" ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
ENV OTP_VERSION 27.2 ENV OTP_VERSION 27.2.1
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system # 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 # https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
ENV OTP_SOURCE_SHA256="b66c2cc4fa2c87211b668e4486d4f3e5b1b6705698873ea3e6d9850801ac992d" ENV OTP_SOURCE_SHA256="07982134e10637dde57cf9cdc6dda6f65425810229986136d184766d4db9eda3"
# install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages # install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang

View File

@ -31,10 +31,10 @@ ENV OPENSSL_SOURCE_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da11
# https://www.openssl.org/source/ # https://www.openssl.org/source/
ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF" ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
ENV OTP_VERSION 27.2 ENV OTP_VERSION 27.2.1
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system # 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 # https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
ENV OTP_SOURCE_SHA256="b66c2cc4fa2c87211b668e4486d4f3e5b1b6705698873ea3e6d9850801ac992d" ENV OTP_SOURCE_SHA256="07982134e10637dde57cf9cdc6dda6f65425810229986136d184766d4db9eda3"
# install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages # install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang
@ -127,11 +127,6 @@ RUN set -eux; \
echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \ echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \
tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \ tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
\ \
# https://github.com/erlang/otp/pull/9212
wget --output-document otp-9212.patch 'https://github.com/erlang/otp/commit/e2604aa7a92b3bb7c1293afd12705c7ce9c952a4.patch?full_index=1'; \
echo '35ec51529bdd6cab4b173b4e1fe844efa82f74eba76a99a74f746778d64dffa7 *otp-9212.patch' | sha256sum -c -; \
patch --input="$PWD/otp-9212.patch" --directory="$OTP_PATH" --strip=1; \
\
# Configure Erlang/OTP for compilation, disable unused features & applications # Configure Erlang/OTP for compilation, disable unused features & applications
# https://erlang.org/doc/applications.html # https://erlang.org/doc/applications.html
# ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation

View File

@ -34,10 +34,10 @@ ENV OPENSSL_SOURCE_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da11
# https://www.openssl.org/source/ # https://www.openssl.org/source/
ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF" ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
ENV OTP_VERSION 27.2 ENV OTP_VERSION 27.2.1
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system # 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 # https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
ENV OTP_SOURCE_SHA256="b66c2cc4fa2c87211b668e4486d4f3e5b1b6705698873ea3e6d9850801ac992d" ENV OTP_SOURCE_SHA256="07982134e10637dde57cf9cdc6dda6f65425810229986136d184766d4db9eda3"
# install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages # install openssl & erlang to a path that isn't auto-checked for libs to prevent accidental use by system packages
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang

View File

@ -134,11 +134,6 @@ RUN set -eux; \
echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \ echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \
tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \ tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
\ \
# https://github.com/erlang/otp/pull/9212
wget --output-document otp-9212.patch 'https://github.com/erlang/otp/commit/e2604aa7a92b3bb7c1293afd12705c7ce9c952a4.patch?full_index=1'; \
echo '35ec51529bdd6cab4b173b4e1fe844efa82f74eba76a99a74f746778d64dffa7 *otp-9212.patch' | sha256sum -c -; \
patch --input="$PWD/otp-9212.patch" --directory="$OTP_PATH" --strip=1; \
\
# Configure Erlang/OTP for compilation, disable unused features & applications # Configure Erlang/OTP for compilation, disable unused features & applications
# https://erlang.org/doc/applications.html # https://erlang.org/doc/applications.html
# ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation

View File

@ -8,8 +8,8 @@
"version": "3.1.7" "version": "3.1.7"
}, },
"otp": { "otp": {
"sha256": "96ce3340450756fdabf8fdb2e3ceb0489eb679f6b51b7b7ac6417c2e6f495bb8", "sha256": "49afee0ae2c5f9537c4c433caf1ae6d04d8b2cf74aa92c50f133d9feebdf1036",
"version": "26.2.5.6" "version": "26.2.5.7"
}, },
"ubuntu": { "ubuntu": {
"version": "24.04" "version": "24.04"
@ -26,8 +26,8 @@
"version": "3.3.2" "version": "3.3.2"
}, },
"otp": { "otp": {
"sha256": "b66c2cc4fa2c87211b668e4486d4f3e5b1b6705698873ea3e6d9850801ac992d", "sha256": "07982134e10637dde57cf9cdc6dda6f65425810229986136d184766d4db9eda3",
"version": "27.2" "version": "27.2.1"
}, },
"ubuntu": { "ubuntu": {
"version": "24.04" "version": "24.04"
@ -44,8 +44,8 @@
"version": "3.3.2" "version": "3.3.2"
}, },
"otp": { "otp": {
"sha256": "b66c2cc4fa2c87211b668e4486d4f3e5b1b6705698873ea3e6d9850801ac992d", "sha256": "07982134e10637dde57cf9cdc6dda6f65425810229986136d184766d4db9eda3",
"version": "27.2" "version": "27.2.1"
}, },
"ubuntu": { "ubuntu": {
"version": "24.04" "version": "24.04"