Update rabbitmq #17581
Merged
Update rabbitmq #17581
+17
−17
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@03faebd: Merge pull request docker-library/rabbitmq#725 from infosiftr/4.0 - docker-library/rabbitmq@266d9cd: Update to 4.0.0 (GA)
Diff for 8964366:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2aac0db..8b7a309 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -22,42 +22,42 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: c30652127ae871535b7ec8ecda8046948a52ab79
Directory: 3.12/alpine/management
-Tags: 3.13.7, 3.13, 3, latest
+Tags: 3.13.7, 3.13, 3
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
GitCommit: bfcb6a804bb3a46c8601d1b65be0675c9ef82eff
Directory: 3.13/ubuntu
-Tags: 3.13.7-alpine, 3.13-alpine, 3-alpine, alpine
+Tags: 3.13.7-alpine, 3.13-alpine, 3-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: bfcb6a804bb3a46c8601d1b65be0675c9ef82eff
Directory: 3.13/alpine
-Tags: 3.13.7-management, 3.13-management, 3-management, management
+Tags: 3.13.7-management, 3.13-management, 3-management
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
Directory: 3.13/ubuntu/management
-Tags: 3.13.7-management-alpine, 3.13-management-alpine, 3-management-alpine, management-alpine
+Tags: 3.13.7-management-alpine, 3.13-management-alpine, 3-management-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
Directory: 3.13/alpine/management
-Tags: 4.0.0-rc.2, 4.0-rc
+Tags: 4.0.0, 4.0, 4, latest
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: ef9ca15a89c29aca626a1b93536e1204c7959e86
-Directory: 4.0-rc/ubuntu
+GitCommit: 266d9cdc38a670282b731e2a0ed0381c49ba9b96
+Directory: 4.0/ubuntu
-Tags: 4.0.0-rc.2-alpine, 4.0-rc-alpine
+Tags: 4.0.0-alpine, 4.0-alpine, 4-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: ef9ca15a89c29aca626a1b93536e1204c7959e86
-Directory: 4.0-rc/alpine
+GitCommit: 266d9cdc38a670282b731e2a0ed0381c49ba9b96
+Directory: 4.0/alpine
-Tags: 4.0.0-rc.2-management, 4.0-rc-management
+Tags: 4.0.0-management, 4.0-management, 4-management, management
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: 3881658e776314fb145db712981c91c52a3e25b8
-Directory: 4.0-rc/ubuntu/management
+GitCommit: 266d9cdc38a670282b731e2a0ed0381c49ba9b96
+Directory: 4.0/ubuntu/management
-Tags: 4.0.0-rc.2-management-alpine, 4.0-rc-management-alpine
+Tags: 4.0.0-management-alpine, 4.0-management-alpine, 4-management-alpine, management-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 3881658e776314fb145db712981c91c52a3e25b8
-Directory: 4.0-rc/alpine/management
+GitCommit: 266d9cdc38a670282b731e2a0ed0381c49ba9b96
+Directory: 4.0/alpine/management
diff --git a/_bashbrew-list b/_bashbrew-list
index 792f604..6a22fb2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,14 +18,18 @@ rabbitmq:3.13.7
rabbitmq:3.13.7-alpine
rabbitmq:3.13.7-management
rabbitmq:3.13.7-management-alpine
-rabbitmq:4.0-rc
-rabbitmq:4.0-rc-alpine
-rabbitmq:4.0-rc-management
-rabbitmq:4.0-rc-management-alpine
-rabbitmq:4.0.0-rc.2
-rabbitmq:4.0.0-rc.2-alpine
-rabbitmq:4.0.0-rc.2-management
-rabbitmq:4.0.0-rc.2-management-alpine
+rabbitmq:4
+rabbitmq:4-alpine
+rabbitmq:4-management
+rabbitmq:4-management-alpine
+rabbitmq:4.0
+rabbitmq:4.0-alpine
+rabbitmq:4.0-management
+rabbitmq:4.0-management-alpine
+rabbitmq:4.0.0
+rabbitmq:4.0.0-alpine
+rabbitmq:4.0.0-management
+rabbitmq:4.0.0-management-alpine
rabbitmq:alpine
rabbitmq:latest
rabbitmq:management
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index b1c227d..e24b826 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,11 +1,11 @@
+rabbitmq:3
+rabbitmq:3-alpine
+rabbitmq:3-management
+rabbitmq:3-management-alpine
rabbitmq:3.12
rabbitmq:3.12-alpine
rabbitmq:3.12-management
rabbitmq:3.12-management-alpine
-rabbitmq:4.0-rc
-rabbitmq:4.0-rc-alpine
-rabbitmq:4.0-rc-management
-rabbitmq:4.0-rc-management-alpine
rabbitmq:alpine
rabbitmq:latest
rabbitmq:management
diff --git a/rabbitmq_4.0-rc-alpine/10-defaults.conf b/rabbitmq_3-alpine/10-defaults.conf
similarity index 100%
rename from rabbitmq_4.0-rc-alpine/10-defaults.conf
rename to rabbitmq_3-alpine/10-defaults.conf
diff --git a/rabbitmq_4.0-rc-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3-alpine/20-management_agent.disable_metrics_collector.conf
similarity index 100%
rename from rabbitmq_4.0-rc-alpine/20-management_agent.disable_metrics_collector.conf
rename to rabbitmq_3-alpine/20-management_agent.disable_metrics_collector.conf
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_3-alpine/Dockerfile
similarity index 100%
copy from rabbitmq_alpine/Dockerfile
copy to rabbitmq_3-alpine/Dockerfile
diff --git a/rabbitmq_4.0-rc-alpine/docker-entrypoint.sh b/rabbitmq_3-alpine/docker-entrypoint.sh
similarity index 100%
rename from rabbitmq_4.0-rc-alpine/docker-entrypoint.sh
rename to rabbitmq_3-alpine/docker-entrypoint.sh
diff --git a/rabbitmq_management-alpine/Dockerfile b/rabbitmq_3-management-alpine/Dockerfile
similarity index 100%
copy from rabbitmq_management-alpine/Dockerfile
copy to rabbitmq_3-management-alpine/Dockerfile
diff --git a/rabbitmq_management/Dockerfile b/rabbitmq_3-management/Dockerfile
similarity index 100%
copy from rabbitmq_management/Dockerfile
copy to rabbitmq_3-management/Dockerfile
diff --git a/rabbitmq_4.0-rc/10-defaults.conf b/rabbitmq_3/10-defaults.conf
similarity index 100%
rename from rabbitmq_4.0-rc/10-defaults.conf
rename to rabbitmq_3/10-defaults.conf
diff --git a/rabbitmq_4.0-rc/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3/20-management_agent.disable_metrics_collector.conf
similarity index 100%
rename from rabbitmq_4.0-rc/20-management_agent.disable_metrics_collector.conf
rename to rabbitmq_3/20-management_agent.disable_metrics_collector.conf
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_3/Dockerfile
similarity index 100%
copy from rabbitmq_latest/Dockerfile
copy to rabbitmq_3/Dockerfile
diff --git a/rabbitmq_4.0-rc/docker-entrypoint.sh b/rabbitmq_3/docker-entrypoint.sh
similarity index 100%
rename from rabbitmq_4.0-rc/docker-entrypoint.sh
rename to rabbitmq_3/docker-entrypoint.sh
diff --git a/rabbitmq_4.0-rc-alpine/Dockerfile b/rabbitmq_4.0-rc-alpine/Dockerfile
deleted file mode 100644
index 35c79a4..0000000
diff --git a/rabbitmq_4.0-rc-management-alpine/Dockerfile b/rabbitmq_4.0-rc-management-alpine/Dockerfile
deleted file mode 100644
index d03a977..0000000
diff --git a/rabbitmq_4.0-rc-management/Dockerfile b/rabbitmq_4.0-rc-management/Dockerfile
deleted file mode 100644
index 2314879..0000000
diff --git a/rabbitmq_4.0-rc/Dockerfile b/rabbitmq_4.0-rc/Dockerfile
deleted file mode 100644
index 132f548..0000000
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index f986845..dd30926 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -23,11 +23,11 @@ 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:3.13 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.13/ubuntu
+# 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
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.1.7
-ENV OPENSSL_SOURCE_SHA256="053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c"
+ENV OPENSSL_VERSION 3.3.2
+ENV OPENSSL_SOURCE_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281"
# https://www.openssl.org/source/
ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
@@ -249,7 +249,7 @@ RUN set -eux; \
tzdata
# Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html)
-ENV RABBITMQ_VERSION 3.13.7
+ENV RABBITMQ_VERSION 4.0.0
# 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 accbe97..85ccc62 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -6,7 +6,7 @@
# The official Canonical Ubuntu Focal image is ideal from a security perspective,
# especially for the enterprises that we, the RabbitMQ team, have to deal with
-FROM ubuntu:22.04 as build-base
+FROM ubuntu:24.04 as build-base
ARG BUILDKIT_SBOM_SCAN_STAGE=true
@@ -26,11 +26,11 @@ 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:3.13 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.13/ubuntu
+# 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
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.1.7
-ENV OPENSSL_SOURCE_SHA256="053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c"
+ENV OPENSSL_VERSION 3.3.2
+ENV OPENSSL_SOURCE_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281"
# https://www.openssl.org/source/
ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
@@ -199,7 +199,7 @@ ENV PATH $ERLANG_INSTALL_PATH_PREFIX/bin:$PATH
RUN find $ERLANG_INSTALL_PATH_PREFIX -type f -name 'crypto.so' -exec ldd {} \; | awk '/libcrypto\.so/ { if (!index($3,ENVIRON["OPENSSL_INSTALL_PATH_PREFIX"])) exit 1 }'
RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().'
-FROM ubuntu:22.04
+FROM ubuntu:24.04
# OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang
@@ -236,7 +236,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 3.13.7
+ENV RABBITMQ_VERSION 4.0.0
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
ENV RABBITMQ_HOME /opt/rabbitmq
diff --git a/rabbitmq_management-alpine/Dockerfile b/rabbitmq_management-alpine/Dockerfile
index 174e0af..a7f01de 100644
--- a/rabbitmq_management-alpine/Dockerfile
+++ b/rabbitmq_management-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM rabbitmq:3.13-alpine
+FROM rabbitmq:4.0-alpine
RUN set eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
diff --git a/rabbitmq_management/Dockerfile b/rabbitmq_management/Dockerfile
index 1485592..d7d8540 100644
--- a/rabbitmq_management/Dockerfile
+++ b/rabbitmq_management/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM rabbitmq:3.13
+FROM rabbitmq:4.0
RUN set eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \Relevant Maintainers: |
yosifkit
approved these changes
Sep 18, 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: