-
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 #17604
Merged
Merged
Update rabbitmq #17604
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@c632cbc: Update 4.0 to 4.0.2 - docker-library/rabbitmq@7268d78: Merge pull request docker-library/rabbitmq#729 from infosiftr/set-eux - docker-library/rabbitmq@36e4d24: Add missing `-` in `set -eux`
Diff for 5231733:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7bf58fc..746c237 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -14,12 +14,12 @@ Directory: 3.12/alpine
Tags: 3.12.14-management, 3.12-management
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: c30652127ae871535b7ec8ecda8046948a52ab79
+GitCommit: 36e4d246e934a96b1c3a920e398f96434f3fc34c
Directory: 3.12/ubuntu/management
Tags: 3.12.14-management-alpine, 3.12-management-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: c30652127ae871535b7ec8ecda8046948a52ab79
+GitCommit: 36e4d246e934a96b1c3a920e398f96434f3fc34c
Directory: 3.12/alpine/management
Tags: 3.13.7, 3.13, 3
@@ -34,30 +34,30 @@ Directory: 3.13/alpine
Tags: 3.13.7-management, 3.13-management, 3-management
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
+GitCommit: 36e4d246e934a96b1c3a920e398f96434f3fc34c
Directory: 3.13/ubuntu/management
Tags: 3.13.7-management-alpine, 3.13-management-alpine, 3-management-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 6cc0f66ec13b06c153a7527c033cf1ad59a97ef3
+GitCommit: 36e4d246e934a96b1c3a920e398f96434f3fc34c
Directory: 3.13/alpine/management
-Tags: 4.0.1, 4.0, 4, latest
+Tags: 4.0.2, 4.0, 4, latest
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: efe509f5e9252e6085b1a34c27359ef51953deed
+GitCommit: c632cbc38e0b7d70678ba2cf5bbaba798af27339
Directory: 4.0/ubuntu
-Tags: 4.0.1-alpine, 4.0-alpine, 4-alpine, alpine
+Tags: 4.0.2-alpine, 4.0-alpine, 4-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: efe509f5e9252e6085b1a34c27359ef51953deed
+GitCommit: c632cbc38e0b7d70678ba2cf5bbaba798af27339
Directory: 4.0/alpine
-Tags: 4.0.1-management, 4.0-management, 4-management, management
+Tags: 4.0.2-management, 4.0-management, 4-management, management
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: 266d9cdc38a670282b731e2a0ed0381c49ba9b96
+GitCommit: 36e4d246e934a96b1c3a920e398f96434f3fc34c
Directory: 4.0/ubuntu/management
-Tags: 4.0.1-management-alpine, 4.0-management-alpine, 4-management-alpine, management-alpine
+Tags: 4.0.2-management-alpine, 4.0-management-alpine, 4-management-alpine, management-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 266d9cdc38a670282b731e2a0ed0381c49ba9b96
+GitCommit: 36e4d246e934a96b1c3a920e398f96434f3fc34c
Directory: 4.0/alpine/management
diff --git a/_bashbrew-list b/_bashbrew-list
index 06cd215..0c95f2a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -26,10 +26,10 @@ rabbitmq:4.0
rabbitmq:4.0-alpine
rabbitmq:4.0-management
rabbitmq:4.0-management-alpine
-rabbitmq:4.0.1
-rabbitmq:4.0.1-alpine
-rabbitmq:4.0.1-management
-rabbitmq:4.0.1-management-alpine
+rabbitmq:4.0.2
+rabbitmq:4.0.2-alpine
+rabbitmq:4.0.2-management
+rabbitmq:4.0.2-management-alpine
rabbitmq:alpine
rabbitmq:latest
rabbitmq:management
diff --git a/rabbitmq_3-management-alpine/Dockerfile b/rabbitmq_3-management-alpine/Dockerfile
index 174e0af..283386d 100644
--- a/rabbitmq_3-management-alpine/Dockerfile
+++ b/rabbitmq_3-management-alpine/Dockerfile
@@ -6,7 +6,7 @@
FROM rabbitmq:3.13-alpine
-RUN set eux; \
+RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
# make sure the metrics collector is re-enabled (disabled in the base image for Prometheus-style metrics by default)
rm -f /etc/rabbitmq/conf.d/20-management_agent.disable_metrics_collector.conf; \
diff --git a/rabbitmq_3-management/Dockerfile b/rabbitmq_3-management/Dockerfile
index 1485592..0ed0f05 100644
--- a/rabbitmq_3-management/Dockerfile
+++ b/rabbitmq_3-management/Dockerfile
@@ -6,7 +6,7 @@
FROM rabbitmq:3.13
-RUN set eux; \
+RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
# make sure the metrics collector is re-enabled (disabled in the base image for Prometheus-style metrics by default)
rm -f /etc/rabbitmq/conf.d/20-management_agent.disable_metrics_collector.conf; \
diff --git a/rabbitmq_3.12-management-alpine/Dockerfile b/rabbitmq_3.12-management-alpine/Dockerfile
index 338e2c3..20ec2e9 100644
--- a/rabbitmq_3.12-management-alpine/Dockerfile
+++ b/rabbitmq_3.12-management-alpine/Dockerfile
@@ -6,7 +6,7 @@
FROM rabbitmq:3.12-alpine
-RUN set eux; \
+RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
# make sure the metrics collector is re-enabled (disabled in the base image for Prometheus-style metrics by default)
rm -f /etc/rabbitmq/conf.d/20-management_agent.disable_metrics_collector.conf; \
diff --git a/rabbitmq_3.12-management/Dockerfile b/rabbitmq_3.12-management/Dockerfile
index b1102ce..1ebfd53 100644
--- a/rabbitmq_3.12-management/Dockerfile
+++ b/rabbitmq_3.12-management/Dockerfile
@@ -6,7 +6,7 @@
FROM rabbitmq:3.12
-RUN set eux; \
+RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
# make sure the metrics collector is re-enabled (disabled in the base image for Prometheus-style metrics by default)
rm -f /etc/rabbitmq/conf.d/20-management_agent.disable_metrics_collector.conf; \
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 7294c46..b7931df 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -249,7 +249,7 @@ RUN set -eux; \
tzdata
# Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html)
-ENV RABBITMQ_VERSION 4.0.1
+ENV RABBITMQ_VERSION 4.0.2
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
ENV RABBITMQ_HOME /opt/rabbitmq
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index 08f5ea9..988ea11 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -236,7 +236,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 4.0.1
+ENV RABBITMQ_VERSION 4.0.2
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID 0x0A9AF2115F4687BD29803A206B73A36E6026DFCA
ENV RABBITMQ_HOME /opt/rabbitmq
diff --git a/rabbitmq_management-alpine/Dockerfile b/rabbitmq_management-alpine/Dockerfile
index a7f01de..f939d7a 100644
--- a/rabbitmq_management-alpine/Dockerfile
+++ b/rabbitmq_management-alpine/Dockerfile
@@ -6,7 +6,7 @@
FROM rabbitmq:4.0-alpine
-RUN set eux; \
+RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
# make sure the metrics collector is re-enabled (disabled in the base image for Prometheus-style metrics by default)
rm -f /etc/rabbitmq/conf.d/20-management_agent.disable_metrics_collector.conf; \
diff --git a/rabbitmq_management/Dockerfile b/rabbitmq_management/Dockerfile
index d7d8540..da5b1b3 100644
--- a/rabbitmq_management/Dockerfile
+++ b/rabbitmq_management/Dockerfile
@@ -6,7 +6,7 @@
FROM rabbitmq:4.0
-RUN set eux; \
+RUN set -eux; \
rabbitmq-plugins enable --offline rabbitmq_management; \
# make sure the metrics collector is re-enabled (disabled in the base image for Prometheus-style metrics by default)
rm -f /etc/rabbitmq/conf.d/20-management_agent.disable_metrics_collector.conf; \ 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:
-
inset -eux
rabbitmq#729 from infosiftr/set-eux-
inset -eux