Update rabbitmq #14900
Merged
Update rabbitmq #14900
Conversation
This file contains hidden or 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@0192a91: Use Ubuntu 22.04 for RabbitMQ 3.12.x (docker-library/rabbitmq#644)
Diff for 862ae74:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e96e53b..b03691f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,12 +4,12 @@ Builder: buildkit
Tags: 3.9.29, 3.9
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 8b63feadd40dbf009de8d0282ec9037e00560707
+GitCommit: 0192a912d656a74b27e8d3ebe0df1aa0d08dd92c
Directory: 3.9/ubuntu
Tags: 3.9.29-alpine, 3.9-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8b63feadd40dbf009de8d0282ec9037e00560707
+GitCommit: 0192a912d656a74b27e8d3ebe0df1aa0d08dd92c
Directory: 3.9/alpine
Tags: 3.9.29-management, 3.9-management
@@ -24,12 +24,12 @@ Directory: 3.9/alpine/management
Tags: 3.10.24, 3.10
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 56b13d64f8314bcfe11e74afaa8f0e0882456a41
+GitCommit: 0192a912d656a74b27e8d3ebe0df1aa0d08dd92c
Directory: 3.10/ubuntu
Tags: 3.10.24-alpine, 3.10-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 56b13d64f8314bcfe11e74afaa8f0e0882456a41
+GitCommit: 0192a912d656a74b27e8d3ebe0df1aa0d08dd92c
Directory: 3.10/alpine
Tags: 3.10.24-management, 3.10-management
@@ -44,12 +44,12 @@ Directory: 3.10/alpine/management
Tags: 3.11.18, 3.11
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 14833a0939f0cb97caf54270c9c90aca1a35c949
+GitCommit: 0192a912d656a74b27e8d3ebe0df1aa0d08dd92c
Directory: 3.11/ubuntu
Tags: 3.11.18-alpine, 3.11-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 14833a0939f0cb97caf54270c9c90aca1a35c949
+GitCommit: 0192a912d656a74b27e8d3ebe0df1aa0d08dd92c
Directory: 3.11/alpine
Tags: 3.11.18-management, 3.11-management
@@ -64,12 +64,12 @@ Directory: 3.11/alpine/management
Tags: 3.12.0, 3.12, 3, latest
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: b7d3633626f3dff15433626045bfcfdba7a5fa3e
+GitCommit: 0192a912d656a74b27e8d3ebe0df1aa0d08dd92c
Directory: 3.12/ubuntu
Tags: 3.12.0-alpine, 3.12-alpine, 3-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b7d3633626f3dff15433626045bfcfdba7a5fa3e
+GitCommit: 0192a912d656a74b27e8d3ebe0df1aa0d08dd92c
Directory: 3.12/alpine
Tags: 3.12.0-management, 3.12-management, 3-management, management
diff --git a/rabbitmq_3.10-alpine/Dockerfile b/rabbitmq_3.10-alpine/Dockerfile
index 23e2b1b..24343dc 100644
--- a/rabbitmq_3.10-alpine/Dockerfile
+++ b/rabbitmq_3.10-alpine/Dockerfile
@@ -24,8 +24,8 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# 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
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.0.9
-ENV OPENSSL_SOURCE_SHA256="eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90"
+ENV OPENSSL_VERSION 3.1.1
+ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674"
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
diff --git a/rabbitmq_3.10/Dockerfile b/rabbitmq_3.10/Dockerfile
index 4f31812..739d503 100644
--- a/rabbitmq_3.10/Dockerfile
+++ b/rabbitmq_3.10/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:20.04 as build-base
+FROM ubuntu:22.04 as build-base
RUN set -eux; \
apt-get update; \
@@ -25,8 +25,8 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# 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
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.0.9
-ENV OPENSSL_SOURCE_SHA256="eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90"
+ENV OPENSSL_VERSION 3.1.1
+ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674"
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
@@ -161,7 +161,7 @@ RUN set -eux; \
# Check that Erlang/OTP crypto & ssl were compiled against OpenSSL correctly
RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().'
-FROM ubuntu:20.04
+FROM ubuntu:22.04
COPY --from=erlang-builder /usr/local/bin/ /usr/local/bin/
COPY --from=erlang-builder /usr/local/etc/ssl/ /usr/local/etc/ssl/
diff --git a/rabbitmq_3.11-alpine/Dockerfile b/rabbitmq_3.11-alpine/Dockerfile
index 8e8870e..34322c7 100644
--- a/rabbitmq_3.11-alpine/Dockerfile
+++ b/rabbitmq_3.11-alpine/Dockerfile
@@ -24,8 +24,8 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.11 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.11/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.0.9
-ENV OPENSSL_SOURCE_SHA256="eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90"
+ENV OPENSSL_VERSION 3.1.1
+ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674"
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
diff --git a/rabbitmq_3.11/Dockerfile b/rabbitmq_3.11/Dockerfile
index f82b568..0e30506 100644
--- a/rabbitmq_3.11/Dockerfile
+++ b/rabbitmq_3.11/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:20.04 as build-base
+FROM ubuntu:22.04 as build-base
RUN set -eux; \
apt-get update; \
@@ -25,8 +25,8 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.11 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.11/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.0.9
-ENV OPENSSL_SOURCE_SHA256="eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90"
+ENV OPENSSL_VERSION 3.1.1
+ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674"
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
@@ -161,7 +161,7 @@ RUN set -eux; \
# Check that Erlang/OTP crypto & ssl were compiled against OpenSSL correctly
RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().'
-FROM ubuntu:20.04
+FROM ubuntu:22.04
COPY --from=erlang-builder /usr/local/bin/ /usr/local/bin/
COPY --from=erlang-builder /usr/local/etc/ssl/ /usr/local/etc/ssl/
diff --git a/rabbitmq_3.9-alpine/Dockerfile b/rabbitmq_3.9-alpine/Dockerfile
index 5cce76b..d868ef0 100644
--- a/rabbitmq_3.9-alpine/Dockerfile
+++ b/rabbitmq_3.9-alpine/Dockerfile
@@ -24,8 +24,8 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# 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
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.0.9
-ENV OPENSSL_SOURCE_SHA256="eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90"
+ENV OPENSSL_VERSION 3.1.1
+ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674"
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
diff --git a/rabbitmq_3.9/Dockerfile b/rabbitmq_3.9/Dockerfile
index 4d60daa..470c168 100644
--- a/rabbitmq_3.9/Dockerfile
+++ b/rabbitmq_3.9/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:20.04 as build-base
+FROM ubuntu:22.04 as build-base
RUN set -eux; \
apt-get update; \
@@ -25,8 +25,8 @@ ARG PGP_KEYSERVER=keyserver.ubuntu.com
# 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
# For context, see https://github.com/docker-library/official-images/issues/4252
-ENV OPENSSL_VERSION 3.0.9
-ENV OPENSSL_SOURCE_SHA256="eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90"
+ENV OPENSSL_VERSION 3.1.1
+ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674"
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
@@ -161,7 +161,7 @@ RUN set -eux; \
# Check that Erlang/OTP crypto & ssl were compiled against OpenSSL correctly
RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().'
-FROM ubuntu:20.04
+FROM ubuntu:22.04
COPY --from=erlang-builder /usr/local/bin/ /usr/local/bin/
COPY --from=erlang-builder /usr/local/etc/ssl/ /usr/local/etc/ssl/
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 9aa6154..2095daa 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -24,8 +24,8 @@ 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.0.9
-ENV OPENSSL_SOURCE_SHA256="eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90"
+ENV OPENSSL_VERSION 3.1.1
+ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674"
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index db82b5e..3bc5b4c 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:20.04 as build-base
+FROM ubuntu:22.04 as build-base
RUN set -eux; \
apt-get update; \
@@ -25,8 +25,8 @@ 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.0.9
-ENV OPENSSL_SOURCE_SHA256="eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90"
+ENV OPENSSL_VERSION 3.1.1
+ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674"
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
@@ -161,7 +161,7 @@ RUN set -eux; \
# Check that Erlang/OTP crypto & ssl were compiled against OpenSSL correctly
RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().'
-FROM ubuntu:20.04
+FROM ubuntu:22.04
COPY --from=erlang-builder /usr/local/bin/ /usr/local/bin/
COPY --from=erlang-builder /usr/local/etc/ssl/ /usr/local/etc/ssl/Relevant 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: