Update to Erlang 22 (and drop HiPE support)

renfeng · May 31, 2019 · 2802b66 · 2802b66
1 parent dbbe820
commit 2802b66
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 100 deletions.
diff --git a/3.7-rc/alpine/Dockerfile b/3.7-rc/alpine/Dockerfile
@@ -16,24 +16,23 @@ ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net
 # For context, see https://github.com/docker-library/official-images/issues/4252
 
 # Using the latest OpenSSL LTS release, with support until September 2023 - https://www.openssl.org/source/
-ENV OPENSSL_VERSION 1.1.1b
-ENV OPENSSL_SOURCE_SHA256="5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b"
+ENV OPENSSL_VERSION 1.1.1c
+ENV OPENSSL_SOURCE_SHA256="f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90"
 # https://www.openssl.org/community/omc.html
-ENV OPENSSL_PGP_KEY_ID="0x8657ABB260F056B1E5190839D9C4D26D0E604491"
+ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
 
 # Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
-ENV OTP_VERSION 21.3.8.1
+ENV OTP_VERSION 22.0.1
 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system
 # http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="2aac8e6e16eae2cf7ebee19b07ea7b5931a85763c4ff20186dd37125177f737f"
+ENV OTP_SOURCE_SHA256="694f133abfca3c7fb8376b223ea484413bcd16b82354f178fba798f37335f163"
 
 # Install dependencies required to build Erlang/OTP from source
 # http://erlang.org/doc/installation_guide/INSTALL.html
 # autoconf: Required to configure Erlang/OTP before compiling
 # dpkg-dev: Required to set up host & build type when compiling Erlang/OTP
 # gnupg: Required to verify OpenSSL artefacts
 # libncurses5-dev: Required for Erlang/OTP new shell & observer_cli - https://github.com/zhongwencool/observer_cli
-# m4: Required for Erlang/OTP HiPE support
 RUN set -eux; \
 	\
 	apk add --no-cache --virtual .build-deps \
@@ -44,7 +43,6 @@ RUN set -eux; \
 		gnupg \
 		libc-dev \
 		linux-headers \
-		m4 \
 		make \
 		ncurses-dev \
 		wget \
@@ -61,7 +59,9 @@ RUN set -eux; \
 	wget --progress dot:giga --output-document "$OPENSSL_PATH.tar.gz.asc" "$OPENSSL_SOURCE_URL.asc"; \
 	wget --progress dot:giga --output-document "$OPENSSL_PATH.tar.gz" "$OPENSSL_SOURCE_URL"; \
 	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$OPENSSL_PGP_KEY_ID"; \
+	for key in $OPENSSL_PGP_KEY_IDS; do \
+		gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$key"; \
+	done; \
 	gpg --batch --verify "$OPENSSL_PATH.tar.gz.asc" "$OPENSSL_PATH.tar.gz"; \
 	gpgconf --kill all; \
 	rm -rf "$GNUPGHOME"; \
@@ -107,16 +107,11 @@ RUN set -eux; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
-	case "$dpkgArch" in \
-# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
-		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
-		*) hipe='--disable-hipe' ;; \
-	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
-		$hipe \
 		--disable-dynamic-ssl-lib \
+		--disable-hipe \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
@@ -136,6 +131,7 @@ RUN set -eux; \
 		--without-et \
 		--without-eunit \
 		--without-ftp \
+		--without-hipe \
 		--without-jinterface \
 		--without-megaco \
 		--without-observer \

diff --git a/3.7-rc/alpine/docker-entrypoint.sh b/3.7-rc/alpine/docker-entrypoint.sh
@@ -55,7 +55,6 @@ rabbitConfigKeys=(
 	default_pass
 	default_user
 	default_vhost
-	hipe_compile
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
@@ -267,7 +266,7 @@ rabbit_env_config() {
 		local val="${!var:-}"
 		local rawVal="$val"
 		case "$conf" in
-			fail_if_no_peer_cert|hipe_compile)
+			fail_if_no_peer_cert)
 				case "${val,,}" in
 					false|no|0|'') rawVal='false' ;;
 					true|yes|1|*) rawVal='true' ;;

diff --git a/3.7-rc/ubuntu/Dockerfile b/3.7-rc/ubuntu/Dockerfile
@@ -19,24 +19,23 @@ ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net
 # For context, see https://github.com/docker-library/official-images/issues/4252
 
 # Using the latest OpenSSL LTS release, with support until September 2023 - https://www.openssl.org/source/
-ENV OPENSSL_VERSION 1.1.1b
-ENV OPENSSL_SOURCE_SHA256="5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b"
+ENV OPENSSL_VERSION 1.1.1c
+ENV OPENSSL_SOURCE_SHA256="f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90"
 # https://www.openssl.org/community/omc.html
-ENV OPENSSL_PGP_KEY_ID="0x8657ABB260F056B1E5190839D9C4D26D0E604491"
+ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
 
 # Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
-ENV OTP_VERSION 21.3.8.1
+ENV OTP_VERSION 22.0.1
 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system
 # http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="2aac8e6e16eae2cf7ebee19b07ea7b5931a85763c4ff20186dd37125177f737f"
+ENV OTP_SOURCE_SHA256="694f133abfca3c7fb8376b223ea484413bcd16b82354f178fba798f37335f163"
 
 # Install dependencies required to build Erlang/OTP from source
 # http://erlang.org/doc/installation_guide/INSTALL.html
 # autoconf: Required to configure Erlang/OTP before compiling
 # dpkg-dev: Required to set up host & build type when compiling Erlang/OTP
 # gnupg: Required to verify OpenSSL artefacts
 # libncurses5-dev: Required for Erlang/OTP new shell & observer_cli - https://github.com/zhongwencool/observer_cli
-# m4: Required for Erlang/OTP HiPE support
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
@@ -48,7 +47,6 @@ RUN set -eux; \
 		gcc \
 		gnupg \
 		libncurses5-dev \
-		m4 \
 		make \
 		wget \
 	; \
@@ -62,7 +60,9 @@ RUN set -eux; \
 	wget --progress dot:giga --output-document "$OPENSSL_PATH.tar.gz.asc" "$OPENSSL_SOURCE_URL.asc"; \
 	wget --progress dot:giga --output-document "$OPENSSL_PATH.tar.gz" "$OPENSSL_SOURCE_URL"; \
 	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$OPENSSL_PGP_KEY_ID"; \
+	for key in $OPENSSL_PGP_KEY_IDS; do \
+		gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$key"; \
+	done; \
 	gpg --batch --verify "$OPENSSL_PATH.tar.gz.asc" "$OPENSSL_PATH.tar.gz"; \
 	gpgconf --kill all; \
 	rm -rf "$GNUPGHOME"; \
@@ -112,16 +112,11 @@ RUN set -eux; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
-	case "$dpkgArch" in \
-# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
-		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
-		*) hipe='--disable-hipe' ;; \
-	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
-		$hipe \
 		--disable-dynamic-ssl-lib \
+		--disable-hipe \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
@@ -141,6 +136,7 @@ RUN set -eux; \
 		--without-et \
 		--without-eunit \
 		--without-ftp \
+		--without-hipe \
 		--without-jinterface \
 		--without-megaco \
 		--without-observer \

diff --git a/3.7-rc/ubuntu/docker-entrypoint.sh b/3.7-rc/ubuntu/docker-entrypoint.sh
@@ -55,7 +55,6 @@ rabbitConfigKeys=(
 	default_pass
 	default_user
 	default_vhost
-	hipe_compile
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
@@ -267,7 +266,7 @@ rabbit_env_config() {
 		local val="${!var:-}"
 		local rawVal="$val"
 		case "$conf" in
-			fail_if_no_peer_cert|hipe_compile)
+			fail_if_no_peer_cert)
 				case "${val,,}" in
 					false|no|0|'') rawVal='false' ;;
 					true|yes|1|*) rawVal='true' ;;

diff --git a/3.7/alpine/Dockerfile b/3.7/alpine/Dockerfile
@@ -22,18 +22,17 @@ ENV OPENSSL_SOURCE_SHA256="f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d08
 ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
 
 # Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
-ENV OTP_VERSION 21.3.8.2
+ENV OTP_VERSION 22.0.1
 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system
 # http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="a45bc309b40c507934606723187cb6cdbae547a677d7c52168849864d1ea1c68"
+ENV OTP_SOURCE_SHA256="694f133abfca3c7fb8376b223ea484413bcd16b82354f178fba798f37335f163"
 
 # Install dependencies required to build Erlang/OTP from source
 # http://erlang.org/doc/installation_guide/INSTALL.html
 # autoconf: Required to configure Erlang/OTP before compiling
 # dpkg-dev: Required to set up host & build type when compiling Erlang/OTP
 # gnupg: Required to verify OpenSSL artefacts
 # libncurses5-dev: Required for Erlang/OTP new shell & observer_cli - https://github.com/zhongwencool/observer_cli
-# m4: Required for Erlang/OTP HiPE support
 RUN set -eux; \
 	\
 	apk add --no-cache --virtual .build-deps \
@@ -44,7 +43,6 @@ RUN set -eux; \
 		gnupg \
 		libc-dev \
 		linux-headers \
-		m4 \
 		make \
 		ncurses-dev \
 		wget \
@@ -109,16 +107,11 @@ RUN set -eux; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
-	case "$dpkgArch" in \
-# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
-		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
-		*) hipe='--disable-hipe' ;; \
-	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
-		$hipe \
 		--disable-dynamic-ssl-lib \
+		--disable-hipe \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
@@ -138,6 +131,7 @@ RUN set -eux; \
 		--without-et \
 		--without-eunit \
 		--without-ftp \
+		--without-hipe \
 		--without-jinterface \
 		--without-megaco \
 		--without-observer \

diff --git a/3.7/alpine/docker-entrypoint.sh b/3.7/alpine/docker-entrypoint.sh
@@ -55,7 +55,6 @@ rabbitConfigKeys=(
 	default_pass
 	default_user
 	default_vhost
-	hipe_compile
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
@@ -267,7 +266,7 @@ rabbit_env_config() {
 		local val="${!var:-}"
 		local rawVal="$val"
 		case "$conf" in
-			fail_if_no_peer_cert|hipe_compile)
+			fail_if_no_peer_cert)
 				case "${val,,}" in
 					false|no|0|'') rawVal='false' ;;
 					true|yes|1|*) rawVal='true' ;;

diff --git a/3.7/ubuntu/Dockerfile b/3.7/ubuntu/Dockerfile
@@ -25,18 +25,17 @@ ENV OPENSSL_SOURCE_SHA256="f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d08
 ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
 
 # Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
-ENV OTP_VERSION 21.3.8.2
+ENV OTP_VERSION 22.0.1
 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system
 # http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="a45bc309b40c507934606723187cb6cdbae547a677d7c52168849864d1ea1c68"
+ENV OTP_SOURCE_SHA256="694f133abfca3c7fb8376b223ea484413bcd16b82354f178fba798f37335f163"
 
 # Install dependencies required to build Erlang/OTP from source
 # http://erlang.org/doc/installation_guide/INSTALL.html
 # autoconf: Required to configure Erlang/OTP before compiling
 # dpkg-dev: Required to set up host & build type when compiling Erlang/OTP
 # gnupg: Required to verify OpenSSL artefacts
 # libncurses5-dev: Required for Erlang/OTP new shell & observer_cli - https://github.com/zhongwencool/observer_cli
-# m4: Required for Erlang/OTP HiPE support
 RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
@@ -48,7 +47,6 @@ RUN set -eux; \
 		gcc \
 		gnupg \
 		libncurses5-dev \
-		m4 \
 		make \
 		wget \
 	; \
@@ -114,16 +112,11 @@ RUN set -eux; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
-	case "$dpkgArch" in \
-# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
-		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
-		*) hipe='--disable-hipe' ;; \
-	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
-		$hipe \
 		--disable-dynamic-ssl-lib \
+		--disable-hipe \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
@@ -143,6 +136,7 @@ RUN set -eux; \
 		--without-et \
 		--without-eunit \
 		--without-ftp \
+		--without-hipe \
 		--without-jinterface \
 		--without-megaco \
 		--without-observer \

diff --git a/3.7/ubuntu/docker-entrypoint.sh b/3.7/ubuntu/docker-entrypoint.sh
@@ -55,7 +55,6 @@ rabbitConfigKeys=(
 	default_pass
 	default_user
 	default_vhost
-	hipe_compile
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
@@ -267,7 +266,7 @@ rabbit_env_config() {
 		local val="${!var:-}"
 		local rawVal="$val"
 		case "$conf" in
-			fail_if_no_peer_cert|hipe_compile)
+			fail_if_no_peer_cert)
 				case "${val,,}" in
 					false|no|0|'') rawVal='false' ;;
 					true|yes|1|*) rawVal='true' ;;

diff --git a/3.8-rc/alpine/Dockerfile b/3.8-rc/alpine/Dockerfile
@@ -22,18 +22,17 @@ ENV OPENSSL_SOURCE_SHA256="f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d08
 ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
 
 # Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
-ENV OTP_VERSION 21.3.8.2
+ENV OTP_VERSION 22.0.1
 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system
 # http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="a45bc309b40c507934606723187cb6cdbae547a677d7c52168849864d1ea1c68"
+ENV OTP_SOURCE_SHA256="694f133abfca3c7fb8376b223ea484413bcd16b82354f178fba798f37335f163"
 
 # Install dependencies required to build Erlang/OTP from source
 # http://erlang.org/doc/installation_guide/INSTALL.html
 # autoconf: Required to configure Erlang/OTP before compiling
 # dpkg-dev: Required to set up host & build type when compiling Erlang/OTP
 # gnupg: Required to verify OpenSSL artefacts
 # libncurses5-dev: Required for Erlang/OTP new shell & observer_cli - https://github.com/zhongwencool/observer_cli
-# m4: Required for Erlang/OTP HiPE support
 RUN set -eux; \
 	\
 	apk add --no-cache --virtual .build-deps \
@@ -44,7 +43,6 @@ RUN set -eux; \
 		gnupg \
 		libc-dev \
 		linux-headers \
-		m4 \
 		make \
 		ncurses-dev \
 		wget \
@@ -109,16 +107,11 @@ RUN set -eux; \
 	hostArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)"; \
 	buildArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
-	case "$dpkgArch" in \
-# https://salsa.debian.org/erlang-team/packages/erlang/blob/9e3466473f1c75f6f6866c9957f6c4f535c12c70/debian/control#L40 (HiPE supports a limited set of architectures)
-		amd64 | i386 | ppc64el) hipe='--enable-hipe' ;; \
-		*) hipe='--disable-hipe' ;; \
-	esac; \
 	./configure \
 		--host="$hostArch" \
 		--build="$buildArch" \
-		$hipe \
 		--disable-dynamic-ssl-lib \
+		--disable-hipe \
 		--disable-sctp \
 		--disable-silent-rules \
 		--enable-clock-gettime \
@@ -138,6 +131,7 @@ RUN set -eux; \
 		--without-et \
 		--without-eunit \
 		--without-ftp \
+		--without-hipe \
 		--without-jinterface \
 		--without-megaco \
 		--without-observer \

diff --git a/3.8-rc/alpine/docker-entrypoint.sh b/3.8-rc/alpine/docker-entrypoint.sh
@@ -55,7 +55,6 @@ rabbitConfigKeys=(
 	default_pass
 	default_user
 	default_vhost
-	hipe_compile
 	vm_memory_high_watermark
 )
 fileConfigKeys=(
@@ -267,7 +266,7 @@ rabbit_env_config() {
 		local val="${!var:-}"
 		local rawVal="$val"
 		case "$conf" in
-			fail_if_no_peer_cert|hipe_compile)
+			fail_if_no_peer_cert)
 				case "${val,,}" in
 					false|no|0|'') rawVal='false' ;;
 					true|yes|1|*) rawVal='true' ;;