From 7567231a8c3d2487b0e43a62cf5b4cf6703fbe03 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 23 Sep 2021 11:32:51 -0700 Subject: [PATCH] Update to 3.9.6, Erlang 24.1 --- 3.8/alpine/Dockerfile | 12 +++++++++--- 3.8/ubuntu/Dockerfile | 4 ++-- 3.9/alpine/Dockerfile | 14 ++++++++++---- 3.9/ubuntu/Dockerfile | 6 +++--- Dockerfile-alpine.template | 8 +++++++- versions.json | 10 +++++----- 6 files changed, 36 insertions(+), 18 deletions(-) diff --git a/3.8/alpine/Dockerfile b/3.8/alpine/Dockerfile index 24bdfc4..a62b392 100644 --- a/3.8/alpine/Dockerfile +++ b/3.8/alpine/Dockerfile @@ -26,10 +26,10 @@ ENV OPENSSL_SOURCE_SHA256="0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153 # https://www.openssl.org/community/omc.html ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" -ENV OTP_VERSION 24.0.5 +ENV OTP_VERSION 24.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="a5fec674b11d0a2b888963157a9de60fc384be27ff1a2175cd20708a5b9aa97d" +ENV OTP_SOURCE_SHA256="72945f5e1b508903fb747e1c903aa2ccdff307843e65426a5e583ea81aa162ef" # Install dependencies required to build Erlang/OTP from source # https://erlang.org/doc/installation_guide/INSTALL.html @@ -42,13 +42,14 @@ RUN set -eux; \ apk add --no-cache --virtual .build-deps \ autoconf \ dpkg-dev dpkg \ - gcc \ g++ \ + gcc \ gnupg \ libc-dev \ linux-headers \ make \ ncurses-dev \ + patch \ ; \ \ OPENSSL_SOURCE_URL="https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz"; \ @@ -104,6 +105,11 @@ RUN set -eux; \ echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \ tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \ \ +# https://github.com/erlang/otp/pull/5236 + wget --output-document erlang-configure-expr.patch 'https://github.com/erlang/otp/pull/5236.patch'; \ + patch --strip=1 --input="$PWD/erlang-configure-expr.patch" --directory "$OTP_PATH"; \ + rm erlang-configure-expr.patch; \ + \ # Configure Erlang/OTP for compilation, disable unused features & applications # https://erlang.org/doc/applications.html # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation diff --git a/3.8/ubuntu/Dockerfile b/3.8/ubuntu/Dockerfile index 7d540ff..da1c413 100644 --- a/3.8/ubuntu/Dockerfile +++ b/3.8/ubuntu/Dockerfile @@ -29,10 +29,10 @@ ENV OPENSSL_SOURCE_SHA256="0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153 # https://www.openssl.org/community/omc.html ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" -ENV OTP_VERSION 24.0.5 +ENV OTP_VERSION 24.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="a5fec674b11d0a2b888963157a9de60fc384be27ff1a2175cd20708a5b9aa97d" +ENV OTP_SOURCE_SHA256="72945f5e1b508903fb747e1c903aa2ccdff307843e65426a5e583ea81aa162ef" # Install dependencies required to build Erlang/OTP from source # https://erlang.org/doc/installation_guide/INSTALL.html diff --git a/3.9/alpine/Dockerfile b/3.9/alpine/Dockerfile index da60e22..5298941 100644 --- a/3.9/alpine/Dockerfile +++ b/3.9/alpine/Dockerfile @@ -26,10 +26,10 @@ ENV OPENSSL_SOURCE_SHA256="0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153 # https://www.openssl.org/community/omc.html ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" -ENV OTP_VERSION 24.0.5 +ENV OTP_VERSION 24.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="a5fec674b11d0a2b888963157a9de60fc384be27ff1a2175cd20708a5b9aa97d" +ENV OTP_SOURCE_SHA256="72945f5e1b508903fb747e1c903aa2ccdff307843e65426a5e583ea81aa162ef" # Install dependencies required to build Erlang/OTP from source # https://erlang.org/doc/installation_guide/INSTALL.html @@ -42,13 +42,14 @@ RUN set -eux; \ apk add --no-cache --virtual .build-deps \ autoconf \ dpkg-dev dpkg \ - gcc \ g++ \ + gcc \ gnupg \ libc-dev \ linux-headers \ make \ ncurses-dev \ + patch \ ; \ \ OPENSSL_SOURCE_URL="https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz"; \ @@ -104,6 +105,11 @@ RUN set -eux; \ echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \ tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \ \ +# https://github.com/erlang/otp/pull/5236 + wget --output-document erlang-configure-expr.patch 'https://github.com/erlang/otp/pull/5236.patch'; \ + patch --strip=1 --input="$PWD/erlang-configure-expr.patch" --directory "$OTP_PATH"; \ + rm erlang-configure-expr.patch; \ + \ # Configure Erlang/OTP for compilation, disable unused features & applications # https://erlang.org/doc/applications.html # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation @@ -190,7 +196,7 @@ RUN set -eux; \ ln -sf "$RABBITMQ_DATA_DIR/.erlang.cookie" /root/.erlang.cookie # Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html) -ENV RABBITMQ_VERSION 3.9.5 +ENV RABBITMQ_VERSION 3.9.6 # https://www.rabbitmq.com/signatures.html#importing-gpg ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA" ENV RABBITMQ_HOME=/opt/rabbitmq diff --git a/3.9/ubuntu/Dockerfile b/3.9/ubuntu/Dockerfile index dd539d7..1289f12 100644 --- a/3.9/ubuntu/Dockerfile +++ b/3.9/ubuntu/Dockerfile @@ -29,10 +29,10 @@ ENV OPENSSL_SOURCE_SHA256="0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153 # https://www.openssl.org/community/omc.html ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D" -ENV OTP_VERSION 24.0.5 +ENV OTP_VERSION 24.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="a5fec674b11d0a2b888963157a9de60fc384be27ff1a2175cd20708a5b9aa97d" +ENV OTP_SOURCE_SHA256="72945f5e1b508903fb747e1c903aa2ccdff307843e65426a5e583ea81aa162ef" # Install dependencies required to build Erlang/OTP from source # https://erlang.org/doc/installation_guide/INSTALL.html @@ -201,7 +201,7 @@ RUN set -eux; \ ln -sf "$RABBITMQ_DATA_DIR/.erlang.cookie" /root/.erlang.cookie # Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html) -ENV RABBITMQ_VERSION 3.9.5 +ENV RABBITMQ_VERSION 3.9.6 # https://www.rabbitmq.com/signatures.html#importing-gpg ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA" ENV RABBITMQ_HOME=/opt/rabbitmq diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 785be35..16a6a3e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -58,13 +58,14 @@ RUN set -eux; \ apk add --no-cache --virtual .build-deps \ autoconf \ dpkg-dev dpkg \ - gcc \ g++ \ + gcc \ gnupg \ libc-dev \ linux-headers \ make \ ncurses-dev \ + patch \ ; \ \ OPENSSL_SOURCE_URL="https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz"; \ @@ -120,6 +121,11 @@ RUN set -eux; \ echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum -c -; \ tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \ \ +# https://github.com/erlang/otp/pull/5236 + wget --output-document erlang-configure-expr.patch 'https://github.com/erlang/otp/pull/5236.patch'; \ + patch --strip=1 --input="$PWD/erlang-configure-expr.patch" --directory "$OTP_PATH"; \ + rm erlang-configure-expr.patch; \ + \ # Configure Erlang/OTP for compilation, disable unused features & applications # https://erlang.org/doc/applications.html # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation diff --git a/versions.json b/versions.json index 566f802..374b6c7 100644 --- a/versions.json +++ b/versions.json @@ -5,8 +5,8 @@ "version": "1.1.1l" }, "otp": { - "sha256": "a5fec674b11d0a2b888963157a9de60fc384be27ff1a2175cd20708a5b9aa97d", - "version": "24.0.5" + "sha256": "72945f5e1b508903fb747e1c903aa2ccdff307843e65426a5e583ea81aa162ef", + "version": "24.1" }, "version": "3.8.22" }, @@ -17,10 +17,10 @@ "version": "1.1.1l" }, "otp": { - "sha256": "a5fec674b11d0a2b888963157a9de60fc384be27ff1a2175cd20708a5b9aa97d", - "version": "24.0.5" + "sha256": "72945f5e1b508903fb747e1c903aa2ccdff307843e65426a5e583ea81aa162ef", + "version": "24.1" }, - "version": "3.9.5" + "version": "3.9.6" }, "3.9-rc": null }