Update rabbitmq #15058
Merged
Update rabbitmq #15058
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@e593e23: Merge pull request docker-library/rabbitmq#652 from infosiftr/3.13-beta - docker-library/rabbitmq@80011d7: Add 3.13.0-beta.2 - docker-library/rabbitmq@055e60f: Update 3.10 to otp 25.3.2.4 - docker-library/rabbitmq@5541d12: Update 3.10 to otp 25.3.2.3 - docker-library/rabbitmq@e8e80fc: Add minor GHA improvements
Diff for 3953094:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 76ff054..19cfcc7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -24,12 +24,12 @@ Directory: 3.9/alpine/management
Tags: 3.10.25, 3.10
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e1f689e636aee8cdd26c9a56a158c0f37ef50514
+GitCommit: 055e60ff8d72e2a920926388cfc79444e7d358d3
Directory: 3.10/ubuntu
Tags: 3.10.25-alpine, 3.10-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e1f689e636aee8cdd26c9a56a158c0f37ef50514
+GitCommit: 055e60ff8d72e2a920926388cfc79444e7d358d3
Directory: 3.10/alpine
Tags: 3.10.25-management, 3.10-management
@@ -81,3 +81,23 @@ Tags: 3.12.2-management-alpine, 3.12-management-alpine, 3-management-alpine, man
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: c30652127ae871535b7ec8ecda8046948a52ab79
Directory: 3.12/alpine/management
+
+Tags: 3.13.0-beta.2, 3.13-rc
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 80011d74327aea3ddd460b189c6533c1f177f48f
+Directory: 3.13-rc/ubuntu
+
+Tags: 3.13.0-beta.2-alpine, 3.13-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 80011d74327aea3ddd460b189c6533c1f177f48f
+Directory: 3.13-rc/alpine
+
+Tags: 3.13.0-beta.2-management, 3.13-rc-management
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: 80011d74327aea3ddd460b189c6533c1f177f48f
+Directory: 3.13-rc/ubuntu/management
+
+Tags: 3.13.0-beta.2-management-alpine, 3.13-rc-management-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 80011d74327aea3ddd460b189c6533c1f177f48f
+Directory: 3.13-rc/alpine/management
diff --git a/_bashbrew-list b/_bashbrew-list
index dd27712..746668d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -34,6 +34,14 @@ rabbitmq:3.12.2
rabbitmq:3.12.2-alpine
rabbitmq:3.12.2-management
rabbitmq:3.12.2-management-alpine
+rabbitmq:3.13-rc
+rabbitmq:3.13-rc-alpine
+rabbitmq:3.13-rc-management
+rabbitmq:3.13-rc-management-alpine
+rabbitmq:3.13.0-beta.2
+rabbitmq:3.13.0-beta.2-alpine
+rabbitmq:3.13.0-beta.2-management
+rabbitmq:3.13.0-beta.2-management-alpine
rabbitmq:alpine
rabbitmq:latest
rabbitmq:management
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 52b8f53..62ab687 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -14,3 +14,7 @@ rabbitmq:latest
rabbitmq:alpine
rabbitmq:management
rabbitmq:management-alpine
+rabbitmq:3.13-rc
+rabbitmq:3.13-rc-alpine
+rabbitmq:3.13-rc-management
+rabbitmq:3.13-rc-management-alpine
diff --git a/rabbitmq_3.10-alpine/10-defaults.conf b/rabbitmq_3.13-rc-alpine/10-defaults.conf
similarity index 100%
copy from rabbitmq_3.10-alpine/10-defaults.conf
copy to rabbitmq_3.13-rc-alpine/10-defaults.conf
diff --git a/rabbitmq_3.10-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3.13-rc-alpine/20-management_agent.disable_metrics_collector.conf
similarity index 100%
copy from rabbitmq_3.10-alpine/20-management_agent.disable_metrics_collector.conf
copy to rabbitmq_3.13-rc-alpine/20-management_agent.disable_metrics_collector.conf
diff --git a/rabbitmq_3.10-alpine/Dockerfile b/rabbitmq_3.13-rc-alpine/Dockerfile
similarity index 98%
copy from rabbitmq_3.10-alpine/Dockerfile
copy to rabbitmq_3.13-rc-alpine/Dockerfile
index 2f0e1bf..c33685d 100644
--- a/rabbitmq_3.10-alpine/Dockerfile
+++ b/rabbitmq_3.13-rc-alpine/Dockerfile
@@ -21,7 +21,7 @@ FROM build-base as openssl-builder
# 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.10 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.10/ubuntu
+# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.13-rc --build-arg PGP_KEYSERVER=pgpkeys.eu 3.13-rc/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
ENV OPENSSL_VERSION 3.1.1
@@ -29,10 +29,10 @@ ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-ENV OTP_VERSION 25.3.2.4
+ENV OTP_VERSION 26.0.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="9d224c098abbb48fbe42abb81bd04765efa2190d9eae4898f78183d9725a676b"
+ENV OTP_SOURCE_SHA256="47853ea9230643a0a31004433f07a71c1b92d6e0094534f629e3b75dbc62f193"
# Install dependencies required to build Erlang/OTP from source
# https://erlang.org/doc/installation_guide/INSTALL.html
@@ -212,7 +212,7 @@ RUN set -eux; \
tzdata
# Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html)
-ENV RABBITMQ_VERSION 3.10.25
+ENV RABBITMQ_VERSION 3.13.0-beta.2
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
ENV RABBITMQ_HOME=/opt/rabbitmq
diff --git a/rabbitmq_3.10-alpine/docker-entrypoint.sh b/rabbitmq_3.13-rc-alpine/docker-entrypoint.sh
similarity index 100%
copy from rabbitmq_3.10-alpine/docker-entrypoint.sh
copy to rabbitmq_3.13-rc-alpine/docker-entrypoint.sh
diff --git a/rabbitmq_3.11-management-alpine/Dockerfile b/rabbitmq_3.13-rc-management-alpine/Dockerfile
similarity index 96%
copy from rabbitmq_3.11-management-alpine/Dockerfile
copy to rabbitmq_3.13-rc-management-alpine/Dockerfile
index 613f7a9..6383ca0 100644
--- a/rabbitmq_3.11-management-alpine/Dockerfile
+++ b/rabbitmq_3.13-rc-management-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM rabbitmq:3.11-alpine
+FROM rabbitmq:3.13-rc-alpine
RUN set eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
diff --git a/rabbitmq_3.9-management/Dockerfile b/rabbitmq_3.13-rc-management/Dockerfile
similarity index 97%
copy from rabbitmq_3.9-management/Dockerfile
copy to rabbitmq_3.13-rc-management/Dockerfile
index a900600..99ee0b5 100644
--- a/rabbitmq_3.9-management/Dockerfile
+++ b/rabbitmq_3.13-rc-management/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM rabbitmq:3.9
+FROM rabbitmq:3.13-rc
RUN set eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
diff --git a/rabbitmq_3.10-alpine/10-defaults.conf b/rabbitmq_3.13-rc/10-defaults.conf
similarity index 100%
copy from rabbitmq_3.10-alpine/10-defaults.conf
copy to rabbitmq_3.13-rc/10-defaults.conf
diff --git a/rabbitmq_3.10-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3.13-rc/20-management_agent.disable_metrics_collector.conf
similarity index 100%
copy from rabbitmq_3.10-alpine/20-management_agent.disable_metrics_collector.conf
copy to rabbitmq_3.13-rc/20-management_agent.disable_metrics_collector.conf
diff --git a/rabbitmq_3.9/Dockerfile b/rabbitmq_3.13-rc/Dockerfile
similarity index 98%
copy from rabbitmq_3.9/Dockerfile
copy to rabbitmq_3.13-rc/Dockerfile
index 3a77fe7..ed5616a 100644
--- a/rabbitmq_3.9/Dockerfile
+++ b/rabbitmq_3.13-rc/Dockerfile
@@ -22,7 +22,7 @@ FROM build-base as openssl-builder
# 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.9 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.9/ubuntu
+# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.13-rc --build-arg PGP_KEYSERVER=pgpkeys.eu 3.13-rc/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
ENV OPENSSL_VERSION 3.1.1
@@ -30,10 +30,10 @@ ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-ENV OTP_VERSION 25.3.2.4
+ENV OTP_VERSION 26.0.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="9d224c098abbb48fbe42abb81bd04765efa2190d9eae4898f78183d9725a676b"
+ENV OTP_SOURCE_SHA256="47853ea9230643a0a31004433f07a71c1b92d6e0094534f629e3b75dbc62f193"
# Install dependencies required to build Erlang/OTP from source
# https://erlang.org/doc/installation_guide/INSTALL.html
@@ -193,7 +193,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.9.29
+ENV RABBITMQ_VERSION 3.13.0-beta.2
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
ENV RABBITMQ_HOME=/opt/rabbitmq
diff --git a/rabbitmq_3.10/docker-entrypoint.sh b/rabbitmq_3.13-rc/docker-entrypoint.sh
similarity index 100%
copy from rabbitmq_3.10/docker-entrypoint.sh
copy to rabbitmq_3.13-rc/docker-entrypoint.shRelevant Maintainers: |
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: