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 #18201

Merged
merged 1 commit into from
Jan 8, 2025
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 7, 2025

Changes:

Changes:

- docker-library/rabbitmq@dd27cf7: Merge pull request docker-library/rabbitmq#751 from docker-library/docker-library-rabbitmq-749
- docker-library/rabbitmq@942e3c7: Patch Erlang build on Alpine
Copy link

github-actions bot commented Jan 7, 2025

Diff for 3564f6c:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7e5dba9..4d60a84 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -9,7 +9,7 @@ Directory: 3.13/ubuntu
 
 Tags: 3.13.7-alpine, 3.13-alpine, 3-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0584c9d30e14c060a7fb677c5134f03da0d6a68d
+GitCommit: 942e3c7fc594b4820a56118251a54fc97224dbe5
 Directory: 3.13/alpine
 
 Tags: 3.13.7-management, 3.13-management, 3-management
@@ -29,7 +29,7 @@ Directory: 4.0/ubuntu
 
 Tags: 4.0.5-alpine, 4.0-alpine, 4-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 16db9e144e0c83d82e82533870054e609dbc8ca4
+GitCommit: 942e3c7fc594b4820a56118251a54fc97224dbe5
 Directory: 4.0/alpine
 
 Tags: 4.0.5-management, 4.0-management, 4-management, management
@@ -49,7 +49,7 @@ Directory: 4.1-rc/ubuntu
 
 Tags: 4.1.0-beta.3-alpine, 4.1-rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0584c9d30e14c060a7fb677c5134f03da0d6a68d
+GitCommit: 942e3c7fc594b4820a56118251a54fc97224dbe5
 Directory: 4.1-rc/alpine
 
 Tags: 4.1.0-beta.3-management, 4.1-rc-management
diff --git a/rabbitmq_3-alpine/Dockerfile b/rabbitmq_3-alpine/Dockerfile
index 6ebb602..7bea989 100644
--- a/rabbitmq_3-alpine/Dockerfile
+++ b/rabbitmq_3-alpine/Dockerfile
@@ -127,6 +127,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/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
 # 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.1-rc-alpine/Dockerfile b/rabbitmq_4.1-rc-alpine/Dockerfile
index c62419f..2bee9df 100644
--- a/rabbitmq_4.1-rc-alpine/Dockerfile
+++ b/rabbitmq_4.1-rc-alpine/Dockerfile
@@ -127,6 +127,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/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
 # 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 9fa2a48..ff4802a 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -127,6 +127,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/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
 # https://erlang.org/doc/applications.html
 # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation

Relevant Maintainers:

@yosifkit yosifkit merged commit 2b40fec into docker-library:master Jan 8, 2025
11 checks passed
@yosifkit yosifkit deleted the rabbitmq branch January 8, 2025 00:03
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