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.

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

Update rabbitmq #18100

Merged
merged 1 commit into from
Dec 14, 2024
Merged

Update rabbitmq #18100

merged 1 commit into from
Dec 14, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 13, 2024

Changes:

Changes:

- docker-library/rabbitmq@1978d63: Merge pull request docker-library/rabbitmq#746 from infosiftr/all-24.04
- docker-library/rabbitmq@a8a529b: Simplify and update `verify-templating.yml`
- docker-library/rabbitmq@55d4ee3: Fix 3.13 build failure on arm32v7 by moving to Ubuntu 24.04
- docker-library/rabbitmq@f792f92: Merge pull request docker-library/rabbitmq#744 from infosiftr/alpine3.21
- docker-library/rabbitmq@0584c9d: Update to Alpine 3.21
@tianon tianon requested a review from a team as a code owner December 13, 2024 23:47
Copy link

Diff for f2dbdb1:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2aefc98..0a00a76 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,12 +4,12 @@ Builder: buildkit
 
 Tags: 3.13.7, 3.13, 3
 Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: bd3e69e85cedd73b08319fd406ee91a9362d55d1
+GitCommit: 55d4ee381759d78087e5b7acde2aa9deba35a847
 Directory: 3.13/ubuntu
 
 Tags: 3.13.7-alpine, 3.13-alpine, 3-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bd3e69e85cedd73b08319fd406ee91a9362d55d1
+GitCommit: 0584c9d30e14c060a7fb677c5134f03da0d6a68d
 Directory: 3.13/alpine
 
 Tags: 3.13.7-management, 3.13-management, 3-management
@@ -29,7 +29,7 @@ Directory: 4.0/ubuntu
 
 Tags: 4.0.4-alpine, 4.0-alpine, 4-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: efb58cd44392eb62a59b4408dffdf09ff5505015
+GitCommit: 0584c9d30e14c060a7fb677c5134f03da0d6a68d
 Directory: 4.0/alpine
 
 Tags: 4.0.4-management, 4.0-management, 4-management, management
@@ -49,7 +49,7 @@ Directory: 4.1-rc/ubuntu
 
 Tags: 4.1.0-beta.3-alpine, 4.1-rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 99ed8dff13e2b79fc189b76bbbfec8d07947e6b9
+GitCommit: 0584c9d30e14c060a7fb677c5134f03da0d6a68d
 Directory: 4.1-rc/alpine
 
 Tags: 4.1.0-beta.3-management, 4.1-rc-management
diff --git a/rabbitmq_3-alpine/Dockerfile b/rabbitmq_3-alpine/Dockerfile
index 4dbacc0..6ebb602 100644
--- a/rabbitmq_3-alpine/Dockerfile
+++ b/rabbitmq_3-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.20 as build-base
+FROM alpine:3.21 as build-base
 
 RUN apk add --no-cache \
 	build-base \
@@ -192,7 +192,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.20
+FROM alpine:3.21
 
 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again
 ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang
diff --git a/rabbitmq_3/Dockerfile b/rabbitmq_3/Dockerfile
index afd2753..58c50b6 100644
--- a/rabbitmq_3/Dockerfile
+++ b/rabbitmq_3/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
 
@@ -199,7 +199,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
diff --git a/rabbitmq_4.1-rc-alpine/Dockerfile b/rabbitmq_4.1-rc-alpine/Dockerfile
index 5077b6e..c62419f 100644
--- a/rabbitmq_4.1-rc-alpine/Dockerfile
+++ b/rabbitmq_4.1-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.20 as build-base
+FROM alpine:3.21 as build-base
 
 RUN apk add --no-cache \
 	build-base \
@@ -192,7 +192,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.20
+FROM alpine:3.21
 
 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again
 ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 866006f..99b2db2 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.20 as build-base
+FROM alpine:3.21 as build-base
 
 RUN apk add --no-cache \
 	build-base \
@@ -192,7 +192,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.20
+FROM alpine:3.21
 
 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again
 ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang

Relevant Maintainers:

@yosifkit yosifkit merged commit 44bf757 into docker-library:master Dec 14, 2024
11 checks passed
@yosifkit yosifkit deleted the rabbitmq branch December 14, 2024 00:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants