Update rabbitmq #17205
Merged
Update rabbitmq #17205
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@53454e0: Merge pull request docker-library/rabbitmq#713 from infosiftr/4.0-pre-release - docker-library/rabbitmq@3881658: Add 4.0-beta.1 pre-release
Diff for fb50d71:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 79acf81..d872b39 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -4,4 +4,5 @@ arm32v7
arm64v8
i386
ppc64le
+riscv64
s390x
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bd66afc..d308b8d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -41,3 +41,23 @@ Tags: 3.13.4-management-alpine, 3.13-management-alpine, 3-management-alpine, man
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
Directory: 3.13/alpine/management
+
+Tags: 4.0.0-beta.1, 4.0-rc
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 3881658e776314fb145db712981c91c52a3e25b8
+Directory: 4.0-rc/ubuntu
+
+Tags: 4.0.0-beta.1-alpine, 4.0-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 3881658e776314fb145db712981c91c52a3e25b8
+Directory: 4.0-rc/alpine
+
+Tags: 4.0.0-beta.1-management, 4.0-rc-management
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 3881658e776314fb145db712981c91c52a3e25b8
+Directory: 4.0-rc/ubuntu/management
+
+Tags: 4.0.0-beta.1-management-alpine, 4.0-rc-management-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 3881658e776314fb145db712981c91c52a3e25b8
+Directory: 4.0-rc/alpine/management
diff --git a/_bashbrew-list b/_bashbrew-list
index 97a1970..a449808 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,6 +18,14 @@ rabbitmq:3.13.4
rabbitmq:3.13.4-alpine
rabbitmq:3.13.4-management
rabbitmq:3.13.4-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-beta.1
+rabbitmq:4.0.0-beta.1-alpine
+rabbitmq:4.0.0-beta.1-management
+rabbitmq:4.0.0-beta.1-management-alpine
rabbitmq:alpine
rabbitmq:latest
rabbitmq:management
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 630ea4f..b1c227d 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -2,6 +2,10 @@ 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_3.12-alpine/10-defaults.conf b/rabbitmq_4.0-rc-alpine/10-defaults.conf
similarity index 100%
copy from rabbitmq_3.12-alpine/10-defaults.conf
copy to rabbitmq_4.0-rc-alpine/10-defaults.conf
diff --git a/rabbitmq_3.12-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_4.0-rc-alpine/20-management_agent.disable_metrics_collector.conf
similarity index 100%
copy from rabbitmq_3.12-alpine/20-management_agent.disable_metrics_collector.conf
copy to rabbitmq_4.0-rc-alpine/20-management_agent.disable_metrics_collector.conf
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_4.0-rc-alpine/Dockerfile
similarity index 98%
copy from rabbitmq_alpine/Dockerfile
copy to rabbitmq_4.0-rc-alpine/Dockerfile
index 822c8ac..3db26f8 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_4.0-rc-alpine/Dockerfile
@@ -5,7 +5,7 @@
#
# Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.19 as build-base
+FROM alpine:3.20 as build-base
RUN apk add --no-cache \
build-base \
@@ -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-rc --build-arg PGP_KEYSERVER=pgpkeys.eu 4.0-rc/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.1.6
-ENV OPENSSL_SOURCE_SHA256="5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7"
+ENV OPENSSL_VERSION 3.3.1
+ENV OPENSSL_SOURCE_SHA256="777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e"
# https://www.openssl.org/community/otc.html
# https://www.openssl.org/source/
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5"
@@ -193,7 +193,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 alpine:3.19
+FROM alpine:3.20
# OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again
ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang
@@ -250,7 +250,7 @@ RUN set -eux; \
tzdata
# Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html)
-ENV RABBITMQ_VERSION 3.13.4
+ENV RABBITMQ_VERSION 4.0.0-beta.1
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
ENV RABBITMQ_HOME /opt/rabbitmq
diff --git a/rabbitmq_3.12-alpine/docker-entrypoint.sh b/rabbitmq_4.0-rc-alpine/docker-entrypoint.sh
similarity index 100%
copy from rabbitmq_3.12-alpine/docker-entrypoint.sh
copy to rabbitmq_4.0-rc-alpine/docker-entrypoint.sh
diff --git a/rabbitmq_management-alpine/Dockerfile b/rabbitmq_4.0-rc-management-alpine/Dockerfile
similarity index 96%
copy from rabbitmq_management-alpine/Dockerfile
copy to rabbitmq_4.0-rc-management-alpine/Dockerfile
index 174e0af..d03a977 100644
--- a/rabbitmq_management-alpine/Dockerfile
+++ b/rabbitmq_4.0-rc-management-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM rabbitmq:3.13-alpine
+FROM rabbitmq:4.0-rc-alpine
RUN set eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
diff --git a/rabbitmq_3.12-management/Dockerfile b/rabbitmq_4.0-rc-management/Dockerfile
similarity index 97%
copy from rabbitmq_3.12-management/Dockerfile
copy to rabbitmq_4.0-rc-management/Dockerfile
index b1102ce..2314879 100644
--- a/rabbitmq_3.12-management/Dockerfile
+++ b/rabbitmq_4.0-rc-management/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM rabbitmq:3.12
+FROM rabbitmq:4.0-rc
RUN set eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
diff --git a/rabbitmq_3.12-alpine/10-defaults.conf b/rabbitmq_4.0-rc/10-defaults.conf
similarity index 100%
copy from rabbitmq_3.12-alpine/10-defaults.conf
copy to rabbitmq_4.0-rc/10-defaults.conf
diff --git a/rabbitmq_3.12-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_4.0-rc/20-management_agent.disable_metrics_collector.conf
similarity index 100%
copy from rabbitmq_3.12-alpine/20-management_agent.disable_metrics_collector.conf
copy to rabbitmq_4.0-rc/20-management_agent.disable_metrics_collector.conf
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_4.0-rc/Dockerfile
similarity index 98%
copy from rabbitmq_latest/Dockerfile
copy to rabbitmq_4.0-rc/Dockerfile
index 94fa871..23511d6 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_4.0-rc/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-rc --build-arg PGP_KEYSERVER=pgpkeys.eu 4.0-rc/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.1.6
-ENV OPENSSL_SOURCE_SHA256="5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7"
+ENV OPENSSL_VERSION 3.3.1
+ENV OPENSSL_SOURCE_SHA256="777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e"
# https://www.openssl.org/community/otc.html
# https://www.openssl.org/source/
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5"
@@ -193,7 +193,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
@@ -230,7 +230,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.4
+ENV RABBITMQ_VERSION 4.0.0-beta.1
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
ENV RABBITMQ_HOME /opt/rabbitmq
diff --git a/rabbitmq_3.12/docker-entrypoint.sh b/rabbitmq_4.0-rc/docker-entrypoint.sh
similarity index 100%
copy from rabbitmq_3.12/docker-entrypoint.sh
copy to rabbitmq_4.0-rc/docker-entrypoint.shRelevant Maintainers: |
LaurentGoderre
approved these changes
Jul 19, 2024
+riscv64Ooooh, |
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.0.0-beta.1pre-release rabbitmq#713 from infosiftr/4.0-pre-release