Update rabbitmq #17286
Merged
Update rabbitmq #17286
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/rabbitmq@bcdd23c: Merge pull request docker-library/rabbitmq#716 from infosiftr/more-github - docker-library/rabbitmq@fc362c9: Upgrade to git ls-remote for openssl releases - docker-library/rabbitmq@4fb9e46: Merge pull request docker-library/rabbitmq#715 from infosiftr/time64 - docker-library/rabbitmq@b957ccb: Backport Erlang time64 patch
Diff for 90c6d0f:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 75d5e0b..d3ef9c0 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,12 +4,12 @@ Builder: buildkit
Tags: 3.12.14, 3.12
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 4714b6a2b184712243839ecca500befce49a66d7
+GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
Directory: 3.12/ubuntu
Tags: 3.12.14-alpine, 3.12-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4714b6a2b184712243839ecca500befce49a66d7
+GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
Directory: 3.12/alpine
Tags: 3.12.14-management, 3.12-management
@@ -24,12 +24,12 @@ Directory: 3.12/alpine/management
Tags: 3.13.6, 3.13, 3, latest
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 753003d979b69971fe7b4a41d36ebd53447ec5e7
+GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
Directory: 3.13/ubuntu
Tags: 3.13.6-alpine, 3.13-alpine, 3-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 753003d979b69971fe7b4a41d36ebd53447ec5e7
+GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
Directory: 3.13/alpine
Tags: 3.13.6-management, 3.13-management, 3-management, management
@@ -44,12 +44,12 @@ Directory: 3.13/alpine/management
Tags: 4.0.0-beta.3, 4.0-rc
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a1177f4c71c9c3214bd1ec3f653d1dbf91e0d3fb
+GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
Directory: 4.0-rc/ubuntu
Tags: 4.0.0-beta.3-alpine, 4.0-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a1177f4c71c9c3214bd1ec3f653d1dbf91e0d3fb
+GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
Directory: 4.0-rc/alpine
Tags: 4.0.0-beta.3-management, 4.0-rc-management
diff --git a/rabbitmq_3.12-alpine/Dockerfile b/rabbitmq_3.12-alpine/Dockerfile
index 57f86fb..0dffdff 100644
--- a/rabbitmq_3.12-alpine/Dockerfile
+++ b/rabbitmq_3.12-alpine/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux; \
# /usr/local/src doesn't exist in Alpine by default
mkdir -p /usr/local/src; \
\
- OPENSSL_SOURCE_URL="https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz"; \
+ OPENSSL_SOURCE_URL="https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz"; \
OPENSSL_PATH="/usr/local/src/openssl-$OPENSSL_VERSION"; \
OPENSSL_CONFIG_DIR="$OPENSSL_INSTALL_PATH_PREFIX/etc/ssl"; \
\
diff --git a/rabbitmq_3.12/Dockerfile b/rabbitmq_3.12/Dockerfile
index 68696e4..0a8f3d0 100644
--- a/rabbitmq_3.12/Dockerfile
+++ b/rabbitmq_3.12/Dockerfile
@@ -50,7 +50,7 @@ ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl
# gnupg: Required to verify OpenSSL artefacts
# libncurses5-dev: Required for Erlang/OTP new shell & observer_cli - https://github.com/zhongwencool/observer_cli
RUN set -eux; \
- OPENSSL_SOURCE_URL="https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz"; \
+ OPENSSL_SOURCE_URL="https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz"; \
OPENSSL_PATH="/usr/local/src/openssl-$OPENSSL_VERSION"; \
OPENSSL_CONFIG_DIR="$OPENSSL_INSTALL_PATH_PREFIX/etc/ssl"; \
\
@@ -127,6 +127,13 @@ RUN set -eux; \
echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum --check --strict -; \
tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
\
+# backport https://github.com/erlang/otp/pull/7952 (applied upstream in OTP 27+) to fix time64 compilation issues on 32bit architectures
+# see also https://bugs.debian.org/1067701, https://salsa.debian.org/erlang-team/packages/erlang/-/blob/89c4e190c6d1d7ee0133d9a8d6bf651ff1861e46/debian/patches/time64.patch
+ wget --output-document otp-time64.patch 'https://github.com/erlang/otp/pull/7952.patch?full_index=1'; \
+ echo 'd1a0c0433a9a08c83171bedd438dd59bb336b40ec75f59edfc3a647b8b0c612d *otp-time64.patch' | sha256sum --check --strict -; \
+ patch --input="$PWD/otp-time64.patch" --directory="$OTP_PATH" --strip=1; \
+ rm otp-time64.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/rabbitmq_4.0-rc-alpine/Dockerfile b/rabbitmq_4.0-rc-alpine/Dockerfile
index e693f4f..648c98b 100644
--- a/rabbitmq_4.0-rc-alpine/Dockerfile
+++ b/rabbitmq_4.0-rc-alpine/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux; \
# /usr/local/src doesn't exist in Alpine by default
mkdir -p /usr/local/src; \
\
- OPENSSL_SOURCE_URL="https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz"; \
+ OPENSSL_SOURCE_URL="https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz"; \
OPENSSL_PATH="/usr/local/src/openssl-$OPENSSL_VERSION"; \
OPENSSL_CONFIG_DIR="$OPENSSL_INSTALL_PATH_PREFIX/etc/ssl"; \
\
diff --git a/rabbitmq_4.0-rc/Dockerfile b/rabbitmq_4.0-rc/Dockerfile
index e173520..6cc0400 100644
--- a/rabbitmq_4.0-rc/Dockerfile
+++ b/rabbitmq_4.0-rc/Dockerfile
@@ -50,7 +50,7 @@ ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl
# gnupg: Required to verify OpenSSL artefacts
# libncurses5-dev: Required for Erlang/OTP new shell & observer_cli - https://github.com/zhongwencool/observer_cli
RUN set -eux; \
- OPENSSL_SOURCE_URL="https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz"; \
+ OPENSSL_SOURCE_URL="https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz"; \
OPENSSL_PATH="/usr/local/src/openssl-$OPENSSL_VERSION"; \
OPENSSL_CONFIG_DIR="$OPENSSL_INSTALL_PATH_PREFIX/etc/ssl"; \
\
@@ -127,6 +127,13 @@ RUN set -eux; \
echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum --check --strict -; \
tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
\
+# backport https://github.com/erlang/otp/pull/7952 (applied upstream in OTP 27+) to fix time64 compilation issues on 32bit architectures
+# see also https://bugs.debian.org/1067701, https://salsa.debian.org/erlang-team/packages/erlang/-/blob/89c4e190c6d1d7ee0133d9a8d6bf651ff1861e46/debian/patches/time64.patch
+ wget --output-document otp-time64.patch 'https://github.com/erlang/otp/pull/7952.patch?full_index=1'; \
+ echo 'd1a0c0433a9a08c83171bedd438dd59bb336b40ec75f59edfc3a647b8b0c612d *otp-time64.patch' | sha256sum --check --strict -; \
+ patch --input="$PWD/otp-time64.patch" --directory="$OTP_PATH" --strip=1; \
+ rm otp-time64.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/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index cf9c34c..585507c 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux; \
# /usr/local/src doesn't exist in Alpine by default
mkdir -p /usr/local/src; \
\
- OPENSSL_SOURCE_URL="https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz"; \
+ OPENSSL_SOURCE_URL="https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz"; \
OPENSSL_PATH="/usr/local/src/openssl-$OPENSSL_VERSION"; \
OPENSSL_CONFIG_DIR="$OPENSSL_INSTALL_PATH_PREFIX/etc/ssl"; \
\
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index cc86d9b..e7357b3 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -50,7 +50,7 @@ ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl
# gnupg: Required to verify OpenSSL artefacts
# libncurses5-dev: Required for Erlang/OTP new shell & observer_cli - https://github.com/zhongwencool/observer_cli
RUN set -eux; \
- OPENSSL_SOURCE_URL="https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz"; \
+ OPENSSL_SOURCE_URL="https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VERSION/openssl-$OPENSSL_VERSION.tar.gz"; \
OPENSSL_PATH="/usr/local/src/openssl-$OPENSSL_VERSION"; \
OPENSSL_CONFIG_DIR="$OPENSSL_INSTALL_PATH_PREFIX/etc/ssl"; \
\
@@ -127,6 +127,13 @@ RUN set -eux; \
echo "$OTP_SOURCE_SHA256 *$OTP_PATH.tar.gz" | sha256sum --check --strict -; \
tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
\
+# backport https://github.com/erlang/otp/pull/7952 (applied upstream in OTP 27+) to fix time64 compilation issues on 32bit architectures
+# see also https://bugs.debian.org/1067701, https://salsa.debian.org/erlang-team/packages/erlang/-/blob/89c4e190c6d1d7ee0133d9a8d6bf651ff1861e46/debian/patches/time64.patch
+ wget --output-document otp-time64.patch 'https://github.com/erlang/otp/pull/7952.patch?full_index=1'; \
+ echo 'd1a0c0433a9a08c83171bedd438dd59bb336b40ec75f59edfc3a647b8b0c612d *otp-time64.patch' | sha256sum --check --strict -; \
+ patch --input="$PWD/otp-time64.patch" --directory="$OTP_PATH" --strip=1; \
+ rm otp-time64.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 installationRelevant Maintainers: |
yosifkit
approved these changes
Jul 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
git ls-remotefor openssl releases rabbitmq#716 from infosiftr/more-github