Update rabbitmq #17507
Merged
Update rabbitmq #17507
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@c2de1a4: Update 4.0-rc to otp 26.2.5.3 - docker-library/rabbitmq@bfcb6a8: Update 3.13 to otp 26.2.5.3 - docker-library/rabbitmq@5cd8feb: Merge pull request docker-library/rabbitmq#719 from infosiftr/openssl-gpg-keys - docker-library/rabbitmq@fd645d8: Update openssl pgp keys and versions
Diff for 86b0329:diff --git a/_bashbrew-cat b/_bashbrew-cat
index d23d29e..477a478 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,12 +4,12 @@ Builder: buildkit
Tags: 3.12.14, 3.12
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
+GitCommit: fd645d88914a864e702b088ecb4bfecf2bb11156
Directory: 3.12/ubuntu
Tags: 3.12.14-alpine, 3.12-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 1859564dc3cf527127118836d293ed12f6138193
+GitCommit: fd645d88914a864e702b088ecb4bfecf2bb11156
Directory: 3.12/alpine
Tags: 3.12.14-management, 3.12-management
@@ -24,12 +24,12 @@ Directory: 3.12/alpine/management
Tags: 3.13.7, 3.13, 3, latest
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: 15c35230e38494fcb064d9a9933735fbce22c1d9
+GitCommit: bfcb6a804bb3a46c8601d1b65be0675c9ef82eff
Directory: 3.13/ubuntu
Tags: 3.13.7-alpine, 3.13-alpine, 3-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 15c35230e38494fcb064d9a9933735fbce22c1d9
+GitCommit: bfcb6a804bb3a46c8601d1b65be0675c9ef82eff
Directory: 3.13/alpine
Tags: 3.13.7-management, 3.13-management, 3-management, management
@@ -44,12 +44,12 @@ Directory: 3.13/alpine/management
Tags: 4.0.0-beta.6, 4.0-rc
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: 8049e562768aa2f2ff8b3b84e03cd111cd212ba2
+GitCommit: c2de1a49b7002562d37bc50d15ea246ff60dafcb
Directory: 4.0-rc/ubuntu
Tags: 4.0.0-beta.6-alpine, 4.0-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 8049e562768aa2f2ff8b3b84e03cd111cd212ba2
+GitCommit: c2de1a49b7002562d37bc50d15ea246ff60dafcb
Directory: 4.0-rc/alpine
Tags: 4.0.0-beta.6-management, 4.0-rc-management
diff --git a/rabbitmq_3.12-alpine/Dockerfile b/rabbitmq_3.12-alpine/Dockerfile
index f5987e2..f06f47a 100644
--- a/rabbitmq_3.12-alpine/Dockerfile
+++ b/rabbitmq_3.12-alpine/Dockerfile
@@ -26,11 +26,10 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# 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
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.1.6
-ENV OPENSSL_SOURCE_SHA256="5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7"
-# https://www.openssl.org/community/otc.html
+ENV OPENSSL_VERSION 3.1.7
+ENV OPENSSL_SOURCE_SHA256="053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c"
# https://www.openssl.org/source/
-ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5"
+ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
ENV OTP_VERSION 25.3.2.13
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
diff --git a/rabbitmq_3.12/Dockerfile b/rabbitmq_3.12/Dockerfile
index 0a8f3d0..3d8da82 100644
--- a/rabbitmq_3.12/Dockerfile
+++ b/rabbitmq_3.12/Dockerfile
@@ -29,11 +29,10 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# 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
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.1.6
-ENV OPENSSL_SOURCE_SHA256="5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7"
-# https://www.openssl.org/community/otc.html
+ENV OPENSSL_VERSION 3.1.7
+ENV OPENSSL_SOURCE_SHA256="053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c"
# https://www.openssl.org/source/
-ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5"
+ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
ENV OTP_VERSION 25.3.2.13
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
diff --git a/rabbitmq_4.0-rc-alpine/Dockerfile b/rabbitmq_4.0-rc-alpine/Dockerfile
index 94df19d..4306f42 100644
--- a/rabbitmq_4.0-rc-alpine/Dockerfile
+++ b/rabbitmq_4.0-rc-alpine/Dockerfile
@@ -26,16 +26,15 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# 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.3.1
-ENV OPENSSL_SOURCE_SHA256="777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e"
-# https://www.openssl.org/community/otc.html
+ENV OPENSSL_VERSION 3.3.2
+ENV OPENSSL_SOURCE_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281"
# https://www.openssl.org/source/
-ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5"
+ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
-ENV OTP_VERSION 26.2.5.2
+ENV OTP_VERSION 26.2.5.3
# 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="e49708cf1f602863e394869af48df4abcb39e3633b96cb4babde3ee7aa724872"
+ENV OTP_SOURCE_SHA256="c2707ce08e91235145cdfc487352f05570a2a0bddf1c478154549eb9e68805b0"
# 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
diff --git a/rabbitmq_4.0-rc/Dockerfile b/rabbitmq_4.0-rc/Dockerfile
index 025aa60..d8b9546 100644
--- a/rabbitmq_4.0-rc/Dockerfile
+++ b/rabbitmq_4.0-rc/Dockerfile
@@ -29,16 +29,15 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# 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.3.1
-ENV OPENSSL_SOURCE_SHA256="777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e"
-# https://www.openssl.org/community/otc.html
+ENV OPENSSL_VERSION 3.3.2
+ENV OPENSSL_SOURCE_SHA256="2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281"
# https://www.openssl.org/source/
-ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5"
+ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
-ENV OTP_VERSION 26.2.5.2
+ENV OTP_VERSION 26.2.5.3
# 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="e49708cf1f602863e394869af48df4abcb39e3633b96cb4babde3ee7aa724872"
+ENV OTP_SOURCE_SHA256="c2707ce08e91235145cdfc487352f05570a2a0bddf1c478154549eb9e68805b0"
# 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
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 51cd8f7..f986845 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -26,16 +26,15 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# 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.6
-ENV OPENSSL_SOURCE_SHA256="5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7"
-# https://www.openssl.org/community/otc.html
+ENV OPENSSL_VERSION 3.1.7
+ENV OPENSSL_SOURCE_SHA256="053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c"
# https://www.openssl.org/source/
-ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5"
+ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
-ENV OTP_VERSION 26.2.5.2
+ENV OTP_VERSION 26.2.5.3
# 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="e49708cf1f602863e394869af48df4abcb39e3633b96cb4babde3ee7aa724872"
+ENV OTP_SOURCE_SHA256="c2707ce08e91235145cdfc487352f05570a2a0bddf1c478154549eb9e68805b0"
# 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
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index 96ffc27..accbe97 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -29,16 +29,15 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# 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.6
-ENV OPENSSL_SOURCE_SHA256="5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7"
-# https://www.openssl.org/community/otc.html
+ENV OPENSSL_VERSION 3.1.7
+ENV OPENSSL_SOURCE_SHA256="053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c"
# https://www.openssl.org/source/
-ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D 0xEFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5"
+ENV OPENSSL_PGP_KEY_IDS="0xBA5473A2B0587B07FB27CF2D216094DFD0CB81EF"
-ENV OTP_VERSION 26.2.5.2
+ENV OTP_VERSION 26.2.5.3
# 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="e49708cf1f602863e394869af48df4abcb39e3633b96cb4babde3ee7aa724872"
+ENV OTP_SOURCE_SHA256="c2707ce08e91235145cdfc487352f05570a2a0bddf1c478154549eb9e68805b0"
# 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/erlangRelevant Maintainers: |
yosifkit
approved these changes
Sep 6, 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: