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.

Sign up for GitHub

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

Jump to bottom

Update rabbitmq #16296

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Update rabbitmq #16296

merged 1 commit into from
Feb 23, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Feb 23, 2024 •
edited
Loading

Changes:

@tianon tianon requested a review from yosifkit as a code owner February 23, 2024 00:28
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
yosifkit
yosifkit previously approved these changes Feb 23, 2024
View reviewed changes
@docker-library-bot
Update rabbitmq
67c5ec1 
Changes:

- docker-library/rabbitmq@a114fee: Merge pull request docker-library/rabbitmq#692 from infosiftr/eol
- docker-library/rabbitmq@d450e17: Remove 3.9, 3.10, 3.11 (EOL and/or out of community support)
- docker-library/rabbitmq@849609c: Merge pull request docker-library/rabbitmq#691 from infosiftr/3.13
- docker-library/rabbitmq@6cc0f66: Update to 3.13.0 (GA)
@github-actions GitHub Actions
Copy link

Diff for 67c5ec1: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 5e86237..f344a70 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,102 +2,42 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <yosi
 GitRepo: https://github.com/docker-library/rabbitmq.git
 Builder: buildkit
 
-Tags: 3.9.29, 3.9
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 9ea1f85dd8c6c84c5d39eb7be881f07b54bbff84
-Directory: 3.9/ubuntu
-
-Tags: 3.9.29-alpine, 3.9-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 9ea1f85dd8c6c84c5d39eb7be881f07b54bbff84
-Directory: 3.9/alpine
-
-Tags: 3.9.29-management, 3.9-management
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: b41c10aaddc91da62f96994ab62e9d1ea590c455
-Directory: 3.9/ubuntu/management
-
-Tags: 3.9.29-management-alpine, 3.9-management-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b41c10aaddc91da62f96994ab62e9d1ea590c455
-Directory: 3.9/alpine/management
-
-Tags: 3.10.25, 3.10
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ea3232ac02c1ddb8237983efc67178fc032700bc
-Directory: 3.10/ubuntu
-
-Tags: 3.10.25-alpine, 3.10-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ea3232ac02c1ddb8237983efc67178fc032700bc
-Directory: 3.10/alpine
-
-Tags: 3.10.25-management, 3.10-management
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: b41c10aaddc91da62f96994ab62e9d1ea590c455
-Directory: 3.10/ubuntu/management
-
-Tags: 3.10.25-management-alpine, 3.10-management-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b41c10aaddc91da62f96994ab62e9d1ea590c455
-Directory: 3.10/alpine/management
-
-Tags: 3.11.28, 3.11
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d68391d9ab512337728326c8d5b6c89878213e2f
-Directory: 3.11/ubuntu
-
-Tags: 3.11.28-alpine, 3.11-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d68391d9ab512337728326c8d5b6c89878213e2f
-Directory: 3.11/alpine
-
-Tags: 3.11.28-management, 3.11-management
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: b41c10aaddc91da62f96994ab62e9d1ea590c455
-Directory: 3.11/ubuntu/management
-
-Tags: 3.11.28-management-alpine, 3.11-management-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b41c10aaddc91da62f96994ab62e9d1ea590c455
-Directory: 3.11/alpine/management
-
-Tags: 3.12.13, 3.12, 3, latest
+Tags: 3.12.13, 3.12
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 06bdf984da8e6b563f8b1d21e38babb180960b2c
 Directory: 3.12/ubuntu
 
-Tags: 3.12.13-alpine, 3.12-alpine, 3-alpine, alpine
+Tags: 3.12.13-alpine, 3.12-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 06bdf984da8e6b563f8b1d21e38babb180960b2c
 Directory: 3.12/alpine
 
-Tags: 3.12.13-management, 3.12-management, 3-management, management
+Tags: 3.12.13-management, 3.12-management
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: c30652127ae871535b7ec8ecda8046948a52ab79
 Directory: 3.12/ubuntu/management
 
-Tags: 3.12.13-management-alpine, 3.12-management-alpine, 3-management-alpine, management-alpine
+Tags: 3.12.13-management-alpine, 3.12-management-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: c30652127ae871535b7ec8ecda8046948a52ab79
 Directory: 3.12/alpine/management
 
-Tags: 3.13.0-rc.5, 3.13-rc
+Tags: 3.13.0, 3.13, 3, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 705900f858d1705bd4ce0ba329b552e97807d4c4
-Directory: 3.13-rc/ubuntu
+GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
+Directory: 3.13/ubuntu
 
-Tags: 3.13.0-rc.5-alpine, 3.13-rc-alpine
+Tags: 3.13.0-alpine, 3.13-alpine, 3-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 705900f858d1705bd4ce0ba329b552e97807d4c4
-Directory: 3.13-rc/alpine
+GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
+Directory: 3.13/alpine
 
-Tags: 3.13.0-rc.5-management, 3.13-rc-management
+Tags: 3.13.0-management, 3.13-management, 3-management, management
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 80011d74327aea3ddd460b189c6533c1f177f48f
-Directory: 3.13-rc/ubuntu/management
+GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
+Directory: 3.13/ubuntu/management
 
-Tags: 3.13.0-rc.5-management-alpine, 3.13-rc-management-alpine
+Tags: 3.13.0-management-alpine, 3.13-management-alpine, 3-management-alpine, management-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 80011d74327aea3ddd460b189c6533c1f177f48f
-Directory: 3.13-rc/alpine/management
+GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
+Directory: 3.13/alpine/management
diff --git a/_bashbrew-list b/_bashbrew-list
index 0134739..bf151ac 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,30 +2,6 @@ rabbitmq:3
 rabbitmq:3-alpine
 rabbitmq:3-management
 rabbitmq:3-management-alpine
-rabbitmq:3.9
-rabbitmq:3.9-alpine
-rabbitmq:3.9-management
-rabbitmq:3.9-management-alpine
-rabbitmq:3.9.29
-rabbitmq:3.9.29-alpine
-rabbitmq:3.9.29-management
-rabbitmq:3.9.29-management-alpine
-rabbitmq:3.10
-rabbitmq:3.10-alpine
-rabbitmq:3.10-management
-rabbitmq:3.10-management-alpine
-rabbitmq:3.10.25
-rabbitmq:3.10.25-alpine
-rabbitmq:3.10.25-management
-rabbitmq:3.10.25-management-alpine
-rabbitmq:3.11
-rabbitmq:3.11-alpine
-rabbitmq:3.11-management
-rabbitmq:3.11-management-alpine
-rabbitmq:3.11.28
-rabbitmq:3.11.28-alpine
-rabbitmq:3.11.28-management
-rabbitmq:3.11.28-management-alpine
 rabbitmq:3.12
 rabbitmq:3.12-alpine
 rabbitmq:3.12-management
@@ -34,14 +10,14 @@ rabbitmq:3.12.13
 rabbitmq:3.12.13-alpine
 rabbitmq:3.12.13-management
 rabbitmq:3.12.13-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-rc.5
-rabbitmq:3.13.0-rc.5-alpine
-rabbitmq:3.13.0-rc.5-management
-rabbitmq:3.13.0-rc.5-management-alpine
+rabbitmq:3.13
+rabbitmq:3.13-alpine
+rabbitmq:3.13-management
+rabbitmq:3.13-management-alpine
+rabbitmq:3.13.0
+rabbitmq:3.13.0-alpine
+rabbitmq:3.13.0-management
+rabbitmq:3.13.0-management-alpine
 rabbitmq:alpine
 rabbitmq:latest
 rabbitmq:management
diff --git a/rabbitmq_3.10-alpine/Dockerfile b/rabbitmq_3.10-alpine/Dockerfile
deleted file mode 100644
index fc3d059..0000000
diff --git a/rabbitmq_3.10-management-alpine/Dockerfile b/rabbitmq_3.10-management-alpine/Dockerfile
deleted file mode 100644
index 7e7c425..0000000
diff --git a/rabbitmq_3.10-management/Dockerfile b/rabbitmq_3.10-management/Dockerfile
deleted file mode 100644
index 477024f..0000000
diff --git a/rabbitmq_3.10/Dockerfile b/rabbitmq_3.10/Dockerfile
deleted file mode 100644
index a2f1716..0000000
diff --git a/rabbitmq_3.11-alpine/10-defaults.conf b/rabbitmq_3.11-alpine/10-defaults.conf
deleted file mode 100644
index 27973c7..0000000
diff --git a/rabbitmq_3.11-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3.11-alpine/20-management_agent.disable_metrics_collector.conf
deleted file mode 100644
index 6eb7a86..0000000
diff --git a/rabbitmq_3.11-alpine/Dockerfile b/rabbitmq_3.11-alpine/Dockerfile
deleted file mode 100644
index 5709cc6..0000000
diff --git a/rabbitmq_3.11-alpine/docker-entrypoint.sh b/rabbitmq_3.11-alpine/docker-entrypoint.sh
deleted file mode 100755
index 7ecad43..0000000
diff --git a/rabbitmq_3.11-management-alpine/Dockerfile b/rabbitmq_3.11-management-alpine/Dockerfile
deleted file mode 100644
index 613f7a9..0000000
diff --git a/rabbitmq_3.11-management/Dockerfile b/rabbitmq_3.11-management/Dockerfile
deleted file mode 100644
index 4c828e2..0000000
diff --git a/rabbitmq_3.11/10-defaults.conf b/rabbitmq_3.11/10-defaults.conf
deleted file mode 100644
index 27973c7..0000000
diff --git a/rabbitmq_3.11/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3.11/20-management_agent.disable_metrics_collector.conf
deleted file mode 100644
index 6eb7a86..0000000
diff --git a/rabbitmq_3.11/Dockerfile b/rabbitmq_3.11/Dockerfile
deleted file mode 100644
index f80bbfb..0000000
diff --git a/rabbitmq_3.11/docker-entrypoint.sh b/rabbitmq_3.11/docker-entrypoint.sh
deleted file mode 100755
index c1c55b6..0000000
diff --git a/rabbitmq_3.10-alpine/10-defaults.conf b/rabbitmq_3.12-alpine/10-defaults.conf
similarity index 100%
rename from rabbitmq_3.10-alpine/10-defaults.conf
rename to rabbitmq_3.12-alpine/10-defaults.conf
diff --git a/rabbitmq_3.10-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3.12-alpine/20-management_agent.disable_metrics_collector.conf
similarity index 100%
rename from rabbitmq_3.10-alpine/20-management_agent.disable_metrics_collector.conf
rename to rabbitmq_3.12-alpine/20-management_agent.disable_metrics_collector.conf
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_3.12-alpine/Dockerfile
similarity index 100%
copy from rabbitmq_alpine/Dockerfile
copy to rabbitmq_3.12-alpine/Dockerfile
diff --git a/rabbitmq_3.10-alpine/docker-entrypoint.sh b/rabbitmq_3.12-alpine/docker-entrypoint.sh
similarity index 100%
rename from rabbitmq_3.10-alpine/docker-entrypoint.sh
rename to rabbitmq_3.12-alpine/docker-entrypoint.sh
diff --git a/rabbitmq_management-alpine/Dockerfile b/rabbitmq_3.12-management-alpine/Dockerfile
similarity index 100%
copy from rabbitmq_management-alpine/Dockerfile
copy to rabbitmq_3.12-management-alpine/Dockerfile
diff --git a/rabbitmq_management/Dockerfile b/rabbitmq_3.12-management/Dockerfile
similarity index 100%
copy from rabbitmq_management/Dockerfile
copy to rabbitmq_3.12-management/Dockerfile
diff --git a/rabbitmq_3.10/10-defaults.conf b/rabbitmq_3.12/10-defaults.conf
similarity index 100%
rename from rabbitmq_3.10/10-defaults.conf
rename to rabbitmq_3.12/10-defaults.conf
diff --git a/rabbitmq_3.10/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3.12/20-management_agent.disable_metrics_collector.conf
similarity index 100%
rename from rabbitmq_3.10/20-management_agent.disable_metrics_collector.conf
rename to rabbitmq_3.12/20-management_agent.disable_metrics_collector.conf
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_3.12/Dockerfile
similarity index 100%
copy from rabbitmq_latest/Dockerfile
copy to rabbitmq_3.12/Dockerfile
diff --git a/rabbitmq_3.10/docker-entrypoint.sh b/rabbitmq_3.12/docker-entrypoint.sh
similarity index 100%
rename from rabbitmq_3.10/docker-entrypoint.sh
rename to rabbitmq_3.12/docker-entrypoint.sh
diff --git a/rabbitmq_3.13-rc-alpine/10-defaults.conf b/rabbitmq_3.13-rc-alpine/10-defaults.conf
deleted file mode 100644
index 27973c7..0000000
diff --git a/rabbitmq_3.13-rc-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3.13-rc-alpine/20-management_agent.disable_metrics_collector.conf
deleted file mode 100644
index 6eb7a86..0000000
diff --git a/rabbitmq_3.13-rc-alpine/Dockerfile b/rabbitmq_3.13-rc-alpine/Dockerfile
deleted file mode 100644
index ca444b3..0000000
diff --git a/rabbitmq_3.13-rc-alpine/docker-entrypoint.sh b/rabbitmq_3.13-rc-alpine/docker-entrypoint.sh
deleted file mode 100755
index 7ecad43..0000000
diff --git a/rabbitmq_3.13-rc-management-alpine/Dockerfile b/rabbitmq_3.13-rc-management-alpine/Dockerfile
deleted file mode 100644
index 6383ca0..0000000
diff --git a/rabbitmq_3.13-rc-management/Dockerfile b/rabbitmq_3.13-rc-management/Dockerfile
deleted file mode 100644
index 99ee0b5..0000000
diff --git a/rabbitmq_3.13-rc/10-defaults.conf b/rabbitmq_3.13-rc/10-defaults.conf
deleted file mode 100644
index 27973c7..0000000
diff --git a/rabbitmq_3.13-rc/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3.13-rc/20-management_agent.disable_metrics_collector.conf
deleted file mode 100644
index 6eb7a86..0000000
diff --git a/rabbitmq_3.13-rc/Dockerfile b/rabbitmq_3.13-rc/Dockerfile
deleted file mode 100644
index e38227c..0000000
diff --git a/rabbitmq_3.13-rc/docker-entrypoint.sh b/rabbitmq_3.13-rc/docker-entrypoint.sh
deleted file mode 100755
index c1c55b6..0000000
diff --git a/rabbitmq_3.9-alpine/10-defaults.conf b/rabbitmq_3.9-alpine/10-defaults.conf
deleted file mode 100644
index 27973c7..0000000
diff --git a/rabbitmq_3.9-alpine/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3.9-alpine/20-management_agent.disable_metrics_collector.conf
deleted file mode 100644
index 6eb7a86..0000000
diff --git a/rabbitmq_3.9-alpine/Dockerfile b/rabbitmq_3.9-alpine/Dockerfile
deleted file mode 100644
index 0f053c5..0000000
diff --git a/rabbitmq_3.9-alpine/docker-entrypoint.sh b/rabbitmq_3.9-alpine/docker-entrypoint.sh
deleted file mode 100755
index 7ecad43..0000000
diff --git a/rabbitmq_3.9-management-alpine/Dockerfile b/rabbitmq_3.9-management-alpine/Dockerfile
deleted file mode 100644
index a2c0da3..0000000
diff --git a/rabbitmq_3.9-management/Dockerfile b/rabbitmq_3.9-management/Dockerfile
deleted file mode 100644
index a900600..0000000
diff --git a/rabbitmq_3.9/10-defaults.conf b/rabbitmq_3.9/10-defaults.conf
deleted file mode 100644
index 27973c7..0000000
diff --git a/rabbitmq_3.9/20-management_agent.disable_metrics_collector.conf b/rabbitmq_3.9/20-management_agent.disable_metrics_collector.conf
deleted file mode 100644
index 6eb7a86..0000000
diff --git a/rabbitmq_3.9/Dockerfile b/rabbitmq_3.9/Dockerfile
deleted file mode 100644
index 1a1d8b0..0000000
diff --git a/rabbitmq_3.9/docker-entrypoint.sh b/rabbitmq_3.9/docker-entrypoint.sh
deleted file mode 100755
index c1c55b6..0000000
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 2711601..67742e6 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -24,7 +24,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:3.12 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.12/ubuntu
+# 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
 # For context, see https://github.com/docker-library/official-images/issues/4252
 
 ENV OPENSSL_VERSION 3.1.5
@@ -33,10 +33,10 @@ ENV OPENSSL_SOURCE_SHA256="6ae015467dabf0469b139ada93319327be24b98251ffaeceda022
 # https://www.openssl.org/source/
 ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5"
 
-ENV OTP_VERSION 25.3.2.9
+ENV OTP_VERSION 26.2.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="b305190e01e84eddb26d0140637f26adf674c87351c679f3bbefc8685d22cc05"
+ENV OTP_SOURCE_SHA256="d537ff4ac5d8c1cb507aedaf7198fc1f155ea8aa65a8d83edb35c2802763cc28"
 
 # 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
@@ -201,7 +201,7 @@ ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang
 ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl
 
 COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX
-RUN echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"erlang-sbom","packages":[{"name":"erlang","versionInfo":"25.3.2.9","SPDXID":"SPDXRef-Package--erlang","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"Apache-2.0"}]}' > $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json
+RUN echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"erlang-sbom","packages":[{"name":"erlang","versionInfo":"26.2.2","SPDXID":"SPDXRef-Package--erlang","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"Apache-2.0"}]}' > $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json
 
 COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX
 RUN echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"openssl-sbom","packages":[{"name":"openssl","versionInfo":"3.1.5","SPDXID":"SPDXRef-Package--openssl","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"Apache-2.0"}]}' > $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json
@@ -254,7 +254,7 @@ RUN set -eux; \
 		tzdata
 
 # Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html)
-ENV RABBITMQ_VERSION 3.12.13
+ENV RABBITMQ_VERSION 3.13.0
 # https://www.rabbitmq.com/signatures.html#importing-gpg
 ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
 ENV RABBITMQ_HOME /opt/rabbitmq
@@ -305,7 +305,7 @@ RUN set -eux; \
 # no stale cookies
 	rm "$RABBITMQ_DATA_DIR/.erlang.cookie";\
 	\
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"rabbitmq-sbom","packages":[{"name":"rabbitmq","versionInfo":"3.12.13","SPDXID":"SPDXRef-Package--rabbitmq","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"MPL-2.0 AND Apache-2.0"}]}' > $RABBITMQ_HOME/rabbitmq.spdx.json;
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"rabbitmq-sbom","packages":[{"name":"rabbitmq","versionInfo":"3.13.0","SPDXID":"SPDXRef-Package--rabbitmq","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"MPL-2.0 AND Apache-2.0"}]}' > $RABBITMQ_HOME/rabbitmq.spdx.json;
 
 # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419)
 RUN su-exec rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index 96ab90f..ede5ff9 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -27,7 +27,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:3.12 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.12/ubuntu
+# 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
 # For context, see https://github.com/docker-library/official-images/issues/4252
 
 ENV OPENSSL_VERSION 3.1.5
@@ -36,10 +36,10 @@ ENV OPENSSL_SOURCE_SHA256="6ae015467dabf0469b139ada93319327be24b98251ffaeceda022
 # https://www.openssl.org/source/
 ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5"
 
-ENV OTP_VERSION 25.3.2.9
+ENV OTP_VERSION 26.2.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="b305190e01e84eddb26d0140637f26adf674c87351c679f3bbefc8685d22cc05"
+ENV OTP_SOURCE_SHA256="d537ff4ac5d8c1cb507aedaf7198fc1f155ea8aa65a8d83edb35c2802763cc28"
 
 # 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
@@ -200,7 +200,7 @@ FROM ubuntu:22.04
 ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang
 ENV OPENSSL_INSTALL_PATH_PREFIX /opt/openssl
 COPY --from=erlang-builder $ERLANG_INSTALL_PATH_PREFIX $ERLANG_INSTALL_PATH_PREFIX
-RUN echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"erlang-sbom","packages":[{"name":"erlang","versionInfo":"25.3.2.9","SPDXID":"SPDXRef-Package--erlang","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=ubuntu&os_version=22.04"}],"licenseDeclared":"Apache-2.0"}]}' > $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json
+RUN echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"erlang-sbom","packages":[{"name":"erlang","versionInfo":"26.2.2","SPDXID":"SPDXRef-Package--erlang","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=ubuntu&os_version=22.04"}],"licenseDeclared":"Apache-2.0"}]}' > $ERLANG_INSTALL_PATH_PREFIX/erlang.spdx.json
 
 COPY --from=openssl-builder $OPENSSL_INSTALL_PATH_PREFIX $OPENSSL_INSTALL_PATH_PREFIX
 RUN echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"openssl-sbom","packages":[{"name":"openssl","versionInfo":"3.1.5","SPDXID":"SPDXRef-Package--openssl","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=ubuntu&os_version=22.04"}],"licenseDeclared":"Apache-2.0"}]}' > $OPENSSL_INSTALL_PATH_PREFIX/openssl.spdx.json
@@ -234,7 +234,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.12.13
+ENV RABBITMQ_VERSION 3.13.0
 # https://www.rabbitmq.com/signatures.html#importing-gpg
 ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
 ENV RABBITMQ_HOME /opt/rabbitmq
@@ -299,7 +299,7 @@ RUN set -eux; \
 # no stale cookies
 	rm "$RABBITMQ_DATA_DIR/.erlang.cookie"; \
 	\
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"rabbitmq-sbom","packages":[{"name":"rabbitmq","versionInfo":"3.12.13","SPDXID":"SPDXRef-Package--rabbitmq","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=ubuntu&os_version=22.04"}],"licenseDeclared":"MPL-2.0 AND Apache-2.0"}]}' > $RABBITMQ_HOME/rabbitmq.spdx.json
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"rabbitmq-sbom","packages":[{"name":"rabbitmq","versionInfo":"3.13.0","SPDXID":"SPDXRef-Package--rabbitmq","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=ubuntu&os_version=22.04"}],"licenseDeclared":"MPL-2.0 AND Apache-2.0"}]}' > $RABBITMQ_HOME/rabbitmq.spdx.json
 
 # Enable Prometheus-style metrics by default (https://github.com/docker-library/rabbitmq/issues/419)
 RUN gosu rabbitmq rabbitmq-plugins enable --offline rabbitmq_prometheus
diff --git a/rabbitmq_management-alpine/Dockerfile b/rabbitmq_management-alpine/Dockerfile
index 338e2c3..174e0af 100644
--- a/rabbitmq_management-alpine/Dockerfile
+++ b/rabbitmq_management-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM rabbitmq:3.12-alpine
+FROM rabbitmq:3.13-alpine
 
 RUN set eux; \
 	rabbitmq-plugins enable --offline rabbitmq_management; \
diff --git a/rabbitmq_management/Dockerfile b/rabbitmq_management/Dockerfile
index b1102ce..1485592 100644
--- a/rabbitmq_management/Dockerfile
+++ b/rabbitmq_management/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM rabbitmq:3.12
+FROM rabbitmq:3.13
 
 RUN set eux; \
 	rabbitmq-plugins enable --offline rabbitmq_management; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 254a20a into docker-library:master Feb 23, 2024
9 checks passed
@yosifkit yosifkit deleted the rabbitmq branch February 23, 2024 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/rabbitmq
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tianon @yosifkit @docker-library-bot