Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rabbitmq #17954

Merged
merged 1 commit into from
Nov 23, 2024
Merged

Update rabbitmq #17954

merged 1 commit into from
Nov 23, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Nov 21, 2024

Changes:

@tianon tianon requested a review from a team as a code owner November 21, 2024 23:43

This comment has been minimized.

@yosifkit
Copy link
Member

Let's get docker-library/rabbitmq#740 merged first.

Changes:

- docker-library/rabbitmq@746395c: Merge pull request docker-library/rabbitmq#740 from infosiftr/erlang-27
- docker-library/rabbitmq@46b1718: Move to erlang 27 for 4.0.4
- docker-library/rabbitmq@4f0a81e: Update 4.0 to 4.0.4
- docker-library/rabbitmq@5598166: Update README
Copy link

Diff for 2fce5bb:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 00a05a6..a8079e8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -22,22 +22,22 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 36e4d246e934a96b1c3a920e398f96434f3fc34c
 Directory: 3.13/alpine/management
 
-Tags: 4.0.3, 4.0, 4, latest
+Tags: 4.0.4, 4.0, 4, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: 471ed1c648396130ba247ce62fb475f666db7d2d
+GitCommit: 46b1718733a32ae79186fe45720c0ce1e9e59194
 Directory: 4.0/ubuntu
 
-Tags: 4.0.3-alpine, 4.0-alpine, 4-alpine, alpine
+Tags: 4.0.4-alpine, 4.0-alpine, 4-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 471ed1c648396130ba247ce62fb475f666db7d2d
+GitCommit: 46b1718733a32ae79186fe45720c0ce1e9e59194
 Directory: 4.0/alpine
 
-Tags: 4.0.3-management, 4.0-management, 4-management, management
+Tags: 4.0.4-management, 4.0-management, 4-management, management
 Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
 GitCommit: 36e4d246e934a96b1c3a920e398f96434f3fc34c
 Directory: 4.0/ubuntu/management
 
-Tags: 4.0.3-management-alpine, 4.0-management-alpine, 4-management-alpine, management-alpine
+Tags: 4.0.4-management-alpine, 4.0-management-alpine, 4-management-alpine, management-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 36e4d246e934a96b1c3a920e398f96434f3fc34c
 Directory: 4.0/alpine/management
diff --git a/_bashbrew-list b/_bashbrew-list
index 3a84201..0e6eaf1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,10 +18,10 @@ rabbitmq:4.0
 rabbitmq:4.0-alpine
 rabbitmq:4.0-management
 rabbitmq:4.0-management-alpine
-rabbitmq:4.0.3
-rabbitmq:4.0.3-alpine
-rabbitmq:4.0.3-management
-rabbitmq:4.0.3-management-alpine
+rabbitmq:4.0.4
+rabbitmq:4.0.4-alpine
+rabbitmq:4.0.4-management
+rabbitmq:4.0.4-management-alpine
 rabbitmq:4.1-rc
 rabbitmq:4.1-rc-alpine
 rabbitmq:4.1-rc-management
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 8d7be5c..5f3c119 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -31,10 +31,10 @@ ENV OPENSSL_SOURCE_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da11
 # https://www.openssl.org/source/
 ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
 
-ENV OTP_VERSION 26.2.5.5
+ENV OTP_VERSION 27.1.2
 # 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="d6e92683cc7505faf124252d390ba14d0c335d15a138c6b770d3b80b33db8f48"
+ENV OTP_SOURCE_SHA256="1772e9fa07b2b020ed5911d6ce78b251dfb6ed8509ed7de9d372e96b87251d14"
 
 # 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
@@ -249,7 +249,7 @@ RUN set -eux; \
 		tzdata
 
 # Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html)
-ENV RABBITMQ_VERSION 4.0.3
+ENV RABBITMQ_VERSION 4.0.4
 # https://www.rabbitmq.com/signatures.html#importing-gpg
 ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
 ENV RABBITMQ_HOME /opt/rabbitmq
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index 6fd6b60..5db3742 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -34,10 +34,10 @@ ENV OPENSSL_SOURCE_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da11
 # https://www.openssl.org/source/
 ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
 
-ENV OTP_VERSION 26.2.5.5
+ENV OTP_VERSION 27.1.2
 # 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="d6e92683cc7505faf124252d390ba14d0c335d15a138c6b770d3b80b33db8f48"
+ENV OTP_SOURCE_SHA256="1772e9fa07b2b020ed5911d6ce78b251dfb6ed8509ed7de9d372e96b87251d14"
 
 # 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
@@ -126,13 +126,6 @@ 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
@@ -236,7 +229,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 4.0.3
+ENV RABBITMQ_VERSION 4.0.4
 # https://www.rabbitmq.com/signatures.html#importing-gpg
 ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
 ENV RABBITMQ_HOME /opt/rabbitmq

Relevant Maintainers:

@yosifkit yosifkit merged commit 927d874 into docker-library:master Nov 23, 2024
11 checks passed
@yosifkit yosifkit deleted the rabbitmq branch November 23, 2024 00:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants