-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 #8251
Merged
Merged
Update rabbitmq #8251
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@817847d: Update to 3.7.27-rc.1, Erlang/OTP 22.3.4.2, OpenSSL 1.1.1g - docker-library/rabbitmq@420735a: Merge pull request docker-library/rabbitmq#421 from infosiftr/alpine3.12 - docker-library/rabbitmq@4f8112f: Update to alpine:3.12
Diff for 5e3d2a9:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6b5d175..b169c88 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,7 +8,7 @@ Directory: 3.7/ubuntu
Tags: 3.7.26-alpine, 3.7-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a5cccf2aa061d8855259d7a05ad8774ee04c4a6f
+GitCommit: 4f8112ffb99b813a1b46bcfc704c02e1b8821773
Directory: 3.7/alpine
Tags: 3.7.26-management, 3.7-management
@@ -21,6 +21,26 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: bf2c73df6ee8475ac30c9773a8128852450ea518
Directory: 3.7/alpine/management
+Tags: 3.7.27-rc.1, 3.7-rc
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 817847dd5566c5d0526d7b654f19c45c91f3289d
+Directory: 3.7-rc/ubuntu
+
+Tags: 3.7.27-rc.1-alpine, 3.7-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 817847dd5566c5d0526d7b654f19c45c91f3289d
+Directory: 3.7-rc/alpine
+
+Tags: 3.7.27-rc.1-management, 3.7-rc-management
+Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 817847dd5566c5d0526d7b654f19c45c91f3289d
+Directory: 3.7-rc/ubuntu/management
+
+Tags: 3.7.27-rc.1-management-alpine, 3.7-rc-management-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 817847dd5566c5d0526d7b654f19c45c91f3289d
+Directory: 3.7-rc/alpine/management
+
Tags: 3.8.5, 3.8, 3, latest
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 9effc7f5dce28daa1024aeb3746580ec9e6ece92
@@ -28,7 +48,7 @@ Directory: 3.8/ubuntu
Tags: 3.8.5-alpine, 3.8-alpine, 3-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 9effc7f5dce28daa1024aeb3746580ec9e6ece92
+GitCommit: 4f8112ffb99b813a1b46bcfc704c02e1b8821773
Directory: 3.8/alpine
Tags: 3.8.5-management, 3.8-management, 3-management, management
diff --git a/_bashbrew-list b/_bashbrew-list
index b4a3d59..9651ae4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,18 @@ rabbitmq:3.7
rabbitmq:3.7-alpine
rabbitmq:3.7-management
rabbitmq:3.7-management-alpine
+rabbitmq:3.7-rc
+rabbitmq:3.7-rc-alpine
+rabbitmq:3.7-rc-management
+rabbitmq:3.7-rc-management-alpine
rabbitmq:3.7.26
rabbitmq:3.7.26-alpine
rabbitmq:3.7.26-management
rabbitmq:3.7.26-management-alpine
+rabbitmq:3.7.27-rc.1
+rabbitmq:3.7.27-rc.1-alpine
+rabbitmq:3.7.27-rc.1-management
+rabbitmq:3.7.27-rc.1-management-alpine
rabbitmq:3.8
rabbitmq:3.8-alpine
rabbitmq:3.8-management
diff --git a/rabbitmq_3.7-alpine/Dockerfile b/rabbitmq_3.7-alpine/Dockerfile
index 169ff67..66e0dbe 100644
--- a/rabbitmq_3.7-alpine/Dockerfile
+++ b/rabbitmq_3.7-alpine/Dockerfile
@@ -1,5 +1,5 @@
# Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.11
+FROM alpine:3.12
RUN apk add --no-cache \
# grab su-exec for easy step-down from root
@@ -37,7 +37,6 @@ RUN set -eux; \
\
apk add --no-cache --virtual .build-deps \
autoconf \
- ca-certificates \
dpkg-dev dpkg \
gcc \
gnupg \
@@ -194,7 +193,6 @@ ENV PATH=$RABBITMQ_HOME/sbin:$PATH \
RUN set -eux; \
\
apk add --no-cache --virtual .build-deps \
- ca-certificates \
gnupg \
xz \
; \
diff --git a/rabbitmq_3.7-alpine/Dockerfile b/rabbitmq_3.7-rc-alpine/Dockerfile
similarity index 99%
copy from rabbitmq_3.7-alpine/Dockerfile
copy to rabbitmq_3.7-rc-alpine/Dockerfile
index 169ff67..873675c 100644
--- a/rabbitmq_3.7-alpine/Dockerfile
+++ b/rabbitmq_3.7-rc-alpine/Dockerfile
@@ -1,5 +1,5 @@
# Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.11
+FROM alpine:3.12
RUN apk add --no-cache \
# grab su-exec for easy step-down from root
@@ -37,7 +37,6 @@ RUN set -eux; \
\
apk add --no-cache --virtual .build-deps \
autoconf \
- ca-certificates \
dpkg-dev dpkg \
gcc \
gnupg \
@@ -181,7 +180,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.7.26
+ENV RABBITMQ_VERSION 3.7.27-rc.1
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
ENV RABBITMQ_HOME=/opt/rabbitmq
@@ -194,7 +193,6 @@ ENV PATH=$RABBITMQ_HOME/sbin:$PATH \
RUN set -eux; \
\
apk add --no-cache --virtual .build-deps \
- ca-certificates \
gnupg \
xz \
; \
diff --git a/rabbitmq_3.7-alpine/docker-entrypoint.sh b/rabbitmq_3.7-rc-alpine/docker-entrypoint.sh
similarity index 100%
copy from rabbitmq_3.7-alpine/docker-entrypoint.sh
copy to rabbitmq_3.7-rc-alpine/docker-entrypoint.sh
diff --git a/rabbitmq_3.7-management-alpine/Dockerfile b/rabbitmq_3.7-rc-management-alpine/Dockerfile
similarity index 96%
copy from rabbitmq_3.7-management-alpine/Dockerfile
copy to rabbitmq_3.7-rc-management-alpine/Dockerfile
index f4128c5..17d1225 100644
--- a/rabbitmq_3.7-management-alpine/Dockerfile
+++ b/rabbitmq_3.7-rc-management-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM rabbitmq:3.7-alpine
+FROM rabbitmq:3.7-rc-alpine
RUN rabbitmq-plugins enable --offline rabbitmq_management
diff --git a/rabbitmq_management/Dockerfile b/rabbitmq_3.7-rc-management/Dockerfile
similarity index 97%
copy from rabbitmq_management/Dockerfile
copy to rabbitmq_3.7-rc-management/Dockerfile
index e315b69..4321ec5 100644
--- a/rabbitmq_management/Dockerfile
+++ b/rabbitmq_3.7-rc-management/Dockerfile
@@ -1,4 +1,4 @@
-FROM rabbitmq:3.8
+FROM rabbitmq:3.7-rc
RUN rabbitmq-plugins enable --offline rabbitmq_management
diff --git a/rabbitmq_3.7/Dockerfile b/rabbitmq_3.7-rc/Dockerfile
similarity index 99%
copy from rabbitmq_3.7/Dockerfile
copy to rabbitmq_3.7-rc/Dockerfile
index e805ec1..8f7b6dd 100644
--- a/rabbitmq_3.7/Dockerfile
+++ b/rabbitmq_3.7-rc/Dockerfile
@@ -191,7 +191,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.7.26
+ENV RABBITMQ_VERSION 3.7.27-rc.1
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
ENV RABBITMQ_HOME=/opt/rabbitmq
diff --git a/rabbitmq_3.7/docker-entrypoint.sh b/rabbitmq_3.7-rc/docker-entrypoint.sh
similarity index 100%
copy from rabbitmq_3.7/docker-entrypoint.sh
copy to rabbitmq_3.7-rc/docker-entrypoint.sh
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 6329715..a967884 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -1,5 +1,5 @@
# Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.11
+FROM alpine:3.12
RUN apk add --no-cache \
# grab su-exec for easy step-down from root
@@ -37,7 +37,6 @@ RUN set -eux; \
\
apk add --no-cache --virtual .build-deps \
autoconf \
- ca-certificates \
dpkg-dev dpkg \
gcc \
gnupg \
@@ -194,7 +193,6 @@ ENV PATH=$RABBITMQ_HOME/sbin:$PATH \
RUN set -eux; \
\
apk add --no-cache --virtual .build-deps \
- ca-certificates \
gnupg \
xz \
; \ |
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: