Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update rabbitmq #17379

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Update rabbitmq #17379

merged 1 commit into from
Aug 16, 2024

Conversation

yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/rabbitmq@f3e7bd5: Merge pull request docker-library/rabbitmq#718 from butlermd/alpine-3.20
- docker-library/rabbitmq@1859564: Alpine 3.20 for all RabbitMQ versions
@yosifkit yosifkit requested a review from a team as a code owner August 16, 2024 19:15
Copy link

Diff for 9620692:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2fa8ac0..7705405 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,8 +8,8 @@ GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
 Directory: 3.12/ubuntu
 
 Tags: 3.12.14-alpine, 3.12-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 1859564dc3cf527127118836d293ed12f6138193
 Directory: 3.12/alpine
 
 Tags: 3.12.14-management, 3.12-management
@@ -18,7 +18,7 @@ GitCommit: c30652127ae871535b7ec8ecda8046948a52ab79
 Directory: 3.12/ubuntu/management
 
 Tags: 3.12.14-management-alpine, 3.12-management-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: c30652127ae871535b7ec8ecda8046948a52ab79
 Directory: 3.12/alpine/management
 
@@ -28,8 +28,8 @@ GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
 Directory: 3.13/ubuntu
 
 Tags: 3.13.6-alpine, 3.13-alpine, 3-alpine, alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: fc362c970aa152f8c0d596f5a81cfc453a2e5eec
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 1859564dc3cf527127118836d293ed12f6138193
 Directory: 3.13/alpine
 
 Tags: 3.13.6-management, 3.13-management, 3-management, management
@@ -38,7 +38,7 @@ GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
 Directory: 3.13/ubuntu/management
 
 Tags: 3.13.6-management-alpine, 3.13-management-alpine, 3-management-alpine, management-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
 Directory: 3.13/alpine/management
 
diff --git a/rabbitmq_3.12-alpine/Dockerfile b/rabbitmq_3.12-alpine/Dockerfile
index 0dffdff..f5987e2 100644
--- a/rabbitmq_3.12-alpine/Dockerfile
+++ b/rabbitmq_3.12-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.19 as build-base
+FROM alpine:3.20 as build-base
 
 RUN apk add --no-cache \
 	build-base \
@@ -193,7 +193,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.19
+FROM alpine:3.20
 
 # 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 585507c..7fbaaff 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.19 as build-base
+FROM alpine:3.20 as build-base
 
 RUN apk add --no-cache \
 	build-base \
@@ -193,7 +193,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.19
+FROM alpine:3.20
 
 # OPENSSL/ERLANG_INSTALL_PATH_PREFIX are defined in a different stage, so define them again
 ENV ERLANG_INSTALL_PATH_PREFIX /opt/erlang

Relevant Maintainers:

@tianon tianon merged commit a7c89fc into docker-library:master Aug 16, 2024
11 checks passed
@tianon tianon deleted the rabbitmq branch August 16, 2024 20:48
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants