Update rabbitmq #17916
Merged
Update rabbitmq #17916
+20
−0
Conversation
This file contains hidden or 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@5aeb28e: Merge pull request docker-library/rabbitmq#738 from infosiftr/4.1-rc - docker-library/rabbitmq@c0dcc40: Add `4.1.0-beta.1` pre-release
Diff for d8156ab:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3d6d481..00a05a6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -41,3 +41,23 @@ Tags: 4.0.3-management-alpine, 4.0-management-alpine, 4-management-alpine, manag
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 36e4d246e934a96b1c3a920e398f96434f3fc34c
Directory: 4.0/alpine/management
+
+Tags: 4.1.0-beta.1, 4.1-rc
+Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
+GitCommit: c0dcc40c9bce4bb6a826a61d250a2aeb0fa35416
+Directory: 4.1-rc/ubuntu
+
+Tags: 4.1.0-beta.1-alpine, 4.1-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: c0dcc40c9bce4bb6a826a61d250a2aeb0fa35416
+Directory: 4.1-rc/alpine
+
+Tags: 4.1.0-beta.1-management, 4.1-rc-management
+Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
+GitCommit: c0dcc40c9bce4bb6a826a61d250a2aeb0fa35416
+Directory: 4.1-rc/ubuntu/management
+
+Tags: 4.1.0-beta.1-management-alpine, 4.1-rc-management-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: c0dcc40c9bce4bb6a826a61d250a2aeb0fa35416
+Directory: 4.1-rc/alpine/management
diff --git a/_bashbrew-list b/_bashbrew-list
index 1e5b2fd..3a84201 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -22,6 +22,14 @@ rabbitmq:4.0.3
rabbitmq:4.0.3-alpine
rabbitmq:4.0.3-management
rabbitmq:4.0.3-management-alpine
+rabbitmq:4.1-rc
+rabbitmq:4.1-rc-alpine
+rabbitmq:4.1-rc-management
+rabbitmq:4.1-rc-management-alpine
+rabbitmq:4.1.0-beta.1
+rabbitmq:4.1.0-beta.1-alpine
+rabbitmq:4.1.0-beta.1-management
+rabbitmq:4.1.0-beta.1-management-alpine
rabbitmq:alpine
rabbitmq:latest
rabbitmq:management
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 68a33dc..9ad9f58 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -2,6 +2,10 @@ rabbitmq:3
rabbitmq:3-alpine
rabbitmq:3-management
rabbitmq:3-management-alpine
+rabbitmq:4.1-rc
+rabbitmq:4.1-rc-alpine
+rabbitmq:4.1-rc-management
+rabbitmq:4.1-rc-management-alpine
rabbitmq:alpine
rabbitmq:latest
rabbitmq:management
diff --git a/rabbitmq_3-alpine/10-defaults.conf b/rabbitmq_4.1-rc-alpine/10-defaults.conf
similarity index 100%
copy from rabbitmq_3-alpine/10-defaults.conf
copy to rabbitmq_4.1-rc-alpine/10-defaults.conf
diff --git a/rabbitmq_3-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_4.1-rc-alpine/20-management_agent.disable_metrics_collector.conf
similarity index 100%
copy from rabbitmq_3-alpine/20-management_agent.disable_metrics_collector.conf
copy to rabbitmq_4.1-rc-alpine/20-management_agent.disable_metrics_collector.conf
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_4.1-rc-alpine/Dockerfile
similarity index 98%
copy from rabbitmq_alpine/Dockerfile
copy to rabbitmq_4.1-rc-alpine/Dockerfile
index 8d7be5c..1dc9840 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_4.1-rc-alpine/Dockerfile
@@ -23,7 +23,7 @@ ARG BUILDKIT_SBOM_SCAN_STAGE=true
# Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally
ARG PGP_KEYSERVER=keyserver.ubuntu.com
# If you are building this image locally and are getting `gpg: keyserver receive failed: No data` errors,
-# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:4.0 --build-arg PGP_KEYSERVER=pgpkeys.eu 4.0/ubuntu
+# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:4.1-rc --build-arg PGP_KEYSERVER=pgpkeys.eu 4.1-rc/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
ENV OPENSSL_VERSION 3.3.2
@@ -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.1.0-beta.1
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
ENV RABBITMQ_HOME /opt/rabbitmq
@@ -267,7 +267,7 @@ RUN set -eux; \
xz \
; \
\
- RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-latest-toolchain-$RABBITMQ_VERSION.tar.xz"; \
+ RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-$RABBITMQ_VERSION.tar.xz"; \
RABBITMQ_PATH="/usr/local/src/rabbitmq-$RABBITMQ_VERSION"; \
\
wget --output-document "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_SOURCE_URL.asc"; \
diff --git a/rabbitmq_3-alpine/docker-entrypoint.sh b/rabbitmq_4.1-rc-alpine/docker-entrypoint.sh
similarity index 100%
copy from rabbitmq_3-alpine/docker-entrypoint.sh
copy to rabbitmq_4.1-rc-alpine/docker-entrypoint.sh
diff --git a/rabbitmq_management-alpine/Dockerfile b/rabbitmq_4.1-rc-management-alpine/Dockerfile
similarity index 96%
copy from rabbitmq_management-alpine/Dockerfile
copy to rabbitmq_4.1-rc-management-alpine/Dockerfile
index f939d7a..a0381ac 100644
--- a/rabbitmq_management-alpine/Dockerfile
+++ b/rabbitmq_4.1-rc-management-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM rabbitmq:4.0-alpine
+FROM rabbitmq:4.1-rc-alpine
RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
diff --git a/rabbitmq_3-management/Dockerfile b/rabbitmq_4.1-rc-management/Dockerfile
similarity index 97%
copy from rabbitmq_3-management/Dockerfile
copy to rabbitmq_4.1-rc-management/Dockerfile
index 0ed0f05..3c29449 100644
--- a/rabbitmq_3-management/Dockerfile
+++ b/rabbitmq_4.1-rc-management/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM rabbitmq:3.13
+FROM rabbitmq:4.1-rc
RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
diff --git a/rabbitmq_3-alpine/10-defaults.conf b/rabbitmq_4.1-rc/10-defaults.conf
similarity index 100%
copy from rabbitmq_3-alpine/10-defaults.conf
copy to rabbitmq_4.1-rc/10-defaults.conf
diff --git a/rabbitmq_3-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_4.1-rc/20-management_agent.disable_metrics_collector.conf
similarity index 100%
copy from rabbitmq_3-alpine/20-management_agent.disable_metrics_collector.conf
copy to rabbitmq_4.1-rc/20-management_agent.disable_metrics_collector.conf
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_4.1-rc/Dockerfile
similarity index 94%
copy from rabbitmq_latest/Dockerfile
copy to rabbitmq_4.1-rc/Dockerfile
index 6fd6b60..9fc0881 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_4.1-rc/Dockerfile
@@ -26,7 +26,7 @@ ARG BUILDKIT_SBOM_SCAN_STAGE=true
# Default to a PGP keyserver that pgp-happy-eyeballs recognizes, but allow for substitutions locally
ARG PGP_KEYSERVER=keyserver.ubuntu.com
# If you are building this image locally and are getting `gpg: keyserver receive failed: No data` errors,
-# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:4.0 --build-arg PGP_KEYSERVER=pgpkeys.eu 4.0/ubuntu
+# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:4.1-rc --build-arg PGP_KEYSERVER=pgpkeys.eu 4.1-rc/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
ENV OPENSSL_VERSION 3.3.2
@@ -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.1.0-beta.1
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
ENV RABBITMQ_HOME /opt/rabbitmq
@@ -266,7 +259,7 @@ RUN set -eux; \
; \
rm -rf /var/lib/apt/lists/*; \
\
- RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-latest-toolchain-$RABBITMQ_VERSION.tar.xz"; \
+ RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-$RABBITMQ_VERSION.tar.xz"; \
RABBITMQ_PATH="/usr/local/src/rabbitmq-$RABBITMQ_VERSION"; \
\
wget --progress dot:giga --output-document "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_SOURCE_URL.asc"; \
diff --git a/rabbitmq_3/docker-entrypoint.sh b/rabbitmq_4.1-rc/docker-entrypoint.sh
similarity index 100%
copy from rabbitmq_3/docker-entrypoint.sh
copy to rabbitmq_4.1-rc/docker-entrypoint.shRelevant Maintainers: |
yosifkit
approved these changes
Nov 16, 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:
4.1.0-beta.1pre-release rabbitmq#738 from infosiftr/4.1-rc4.1.0-beta.1pre-release