Update rabbitmq #9358
Merged
Update rabbitmq #9358
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@0e59f96: Merge pull request docker-library/rabbitmq#458 from infosiftr/jq-template - docker-library/rabbitmq@205a944: Merge pull request docker-library/rabbitmq#457 from infosiftr/newline-at-eof - docker-library/rabbitmq@7e63843: Add initial jq-based templating engine - docker-library/rabbitmq@3644a01: If the provided rabbitmq.conf is missing a newline at EOF, add one before appending to it
Diff for 39bb3f6:diff --git a/_bashbrew-cat b/_bashbrew-cat
index c9bcbdc..5c690cc 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,40 +3,40 @@ GitRepo: https://github.com/docker-library/rabbitmq.git
Tags: 3.8.9, 3.8, 3, latest
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2a3ffff862bc2509d4bade042b9f000863262160
+GitCommit: 0e59f96860d646b2f2c5972af8155fcf871ecfcc
Directory: 3.8/ubuntu
Tags: 3.8.9-alpine, 3.8-alpine, 3-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2a3ffff862bc2509d4bade042b9f000863262160
+GitCommit: 0e59f96860d646b2f2c5972af8155fcf871ecfcc
Directory: 3.8/alpine
Tags: 3.8.9-management, 3.8-management, 3-management, management
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 888638927482f86af6e88bebb67423926cb1112f
+GitCommit: 7e63843da6bfb191ddee6dbe3dd7ec0df36ae70b
Directory: 3.8/ubuntu/management
Tags: 3.8.9-management-alpine, 3.8-management-alpine, 3-management-alpine, management-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 888638927482f86af6e88bebb67423926cb1112f
+GitCommit: 7e63843da6bfb191ddee6dbe3dd7ec0df36ae70b
Directory: 3.8/alpine/management
Tags: 3.8.10-beta.1, 3.8-rc
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 109fc7b35fb72eb038ced5c508e19b83b1f39951
+GitCommit: 0e59f96860d646b2f2c5972af8155fcf871ecfcc
Directory: 3.8-rc/ubuntu
Tags: 3.8.10-beta.1-alpine, 3.8-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 109fc7b35fb72eb038ced5c508e19b83b1f39951
+GitCommit: 0e59f96860d646b2f2c5972af8155fcf871ecfcc
Directory: 3.8-rc/alpine
Tags: 3.8.10-beta.1-management, 3.8-rc-management
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 888638927482f86af6e88bebb67423926cb1112f
+GitCommit: 7e63843da6bfb191ddee6dbe3dd7ec0df36ae70b
Directory: 3.8-rc/ubuntu/management
Tags: 3.8.10-beta.1-management-alpine, 3.8-rc-management-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 888638927482f86af6e88bebb67423926cb1112f
+GitCommit: 7e63843da6bfb191ddee6dbe3dd7ec0df36ae70b
Directory: 3.8-rc/alpine/management
diff --git a/rabbitmq_3.8-rc-alpine/Dockerfile b/rabbitmq_3.8-rc-alpine/Dockerfile
index c31b734..918c29e 100644
--- a/rabbitmq_3.8-rc-alpine/Dockerfile
+++ b/rabbitmq_3.8-rc-alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
FROM alpine:3.12
@@ -15,13 +21,11 @@ ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net
# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.8 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.8/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
-# Using the latest OpenSSL LTS release, with support until September 2023 - https://www.openssl.org/source/
ENV OPENSSL_VERSION 1.1.1i
ENV OPENSSL_SOURCE_SHA256="e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242"
# https://www.openssl.org/community/omc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-# Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
ENV OTP_VERSION 23.2.1
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
diff --git a/rabbitmq_3.8-rc-alpine/docker-entrypoint.sh b/rabbitmq_3.8-rc-alpine/docker-entrypoint.sh
index e1685c0..69093e3 100755
--- a/rabbitmq_3.8-rc-alpine/docker-entrypoint.sh
+++ b/rabbitmq_3.8-rc-alpine/docker-entrypoint.sh
@@ -246,6 +246,7 @@ rabbit_set_config() {
"s/^[[:space:]]*(${sedKey}[[:space:]]*=[[:space:]]*)\S.*\$/\1${sedVal}/" \
"$newConfigFile"
if ! grep -qE "^${sedKey}[[:space:]]*=" "$newConfigFile"; then
+ sed -i -e '$a\' "$newConfigFile" # https://github.com/docker-library/rabbitmq/issues/456#issuecomment-752251872 (https://unix.stackexchange.com/a/31955/153467)
echo "$key = $val" >> "$newConfigFile"
fi
}
diff --git a/rabbitmq_3.8-rc-management-alpine/Dockerfile b/rabbitmq_3.8-rc-management-alpine/Dockerfile
index f0b6630..73e53cf 100644
--- a/rabbitmq_3.8-rc-management-alpine/Dockerfile
+++ b/rabbitmq_3.8-rc-management-alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM rabbitmq:3.8-rc-alpine
RUN rabbitmq-plugins enable --offline rabbitmq_management
diff --git a/rabbitmq_3.8-rc-management/Dockerfile b/rabbitmq_3.8-rc-management/Dockerfile
index 201bd4b..cd99f5a 100644
--- a/rabbitmq_3.8-rc-management/Dockerfile
+++ b/rabbitmq_3.8-rc-management/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM rabbitmq:3.8-rc
RUN rabbitmq-plugins enable --offline rabbitmq_management
@@ -24,7 +30,9 @@ RUN set -eux; \
' -- /plugins/rabbitmq_management-*.ez > /usr/local/bin/rabbitmqadmin; \
[ -s /usr/local/bin/rabbitmqadmin ]; \
chmod +x /usr/local/bin/rabbitmqadmin; \
- apt-get update; apt-get install -y --no-install-recommends python3; rm -rf /var/lib/apt/lists/*; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends python3; \
+ rm -rf /var/lib/apt/lists/*; \
rabbitmqadmin --version
EXPOSE 15671 15672
diff --git a/rabbitmq_3.8-rc/Dockerfile b/rabbitmq_3.8-rc/Dockerfile
index 9633519..6986d13 100644
--- a/rabbitmq_3.8-rc/Dockerfile
+++ b/rabbitmq_3.8-rc/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# The official Canonical Ubuntu Bionic image is ideal from a security perspective,
# especially for the enterprises that we, the RabbitMQ team, have to deal with
FROM ubuntu:18.04
@@ -18,13 +24,11 @@ ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net
# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.8 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.8/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
-# Using the latest OpenSSL LTS release, with support until September 2023 - https://www.openssl.org/source/
ENV OPENSSL_VERSION 1.1.1i
ENV OPENSSL_SOURCE_SHA256="e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242"
# https://www.openssl.org/community/omc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-# Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
ENV OTP_VERSION 23.2.1
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
diff --git a/rabbitmq_3.8-rc/docker-entrypoint.sh b/rabbitmq_3.8-rc/docker-entrypoint.sh
index a06e709..da789b9 100755
--- a/rabbitmq_3.8-rc/docker-entrypoint.sh
+++ b/rabbitmq_3.8-rc/docker-entrypoint.sh
@@ -246,6 +246,7 @@ rabbit_set_config() {
"s/^[[:space:]]*(${sedKey}[[:space:]]*=[[:space:]]*)\S.*\$/\1${sedVal}/" \
"$newConfigFile"
if ! grep -qE "^${sedKey}[[:space:]]*=" "$newConfigFile"; then
+ sed -i -e '$a\' "$newConfigFile" # https://github.com/docker-library/rabbitmq/issues/456#issuecomment-752251872 (https://unix.stackexchange.com/a/31955/153467)
echo "$key = $val" >> "$newConfigFile"
fi
}
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 9c199c0..7b39a17 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
FROM alpine:3.12
@@ -15,13 +21,11 @@ ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net
# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.8 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.8/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
-# Using the latest OpenSSL LTS release, with support until September 2023 - https://www.openssl.org/source/
ENV OPENSSL_VERSION 1.1.1i
ENV OPENSSL_SOURCE_SHA256="e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242"
# https://www.openssl.org/community/omc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-# Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
ENV OTP_VERSION 23.2.1
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
diff --git a/rabbitmq_alpine/docker-entrypoint.sh b/rabbitmq_alpine/docker-entrypoint.sh
index e1685c0..69093e3 100755
--- a/rabbitmq_alpine/docker-entrypoint.sh
+++ b/rabbitmq_alpine/docker-entrypoint.sh
@@ -246,6 +246,7 @@ rabbit_set_config() {
"s/^[[:space:]]*(${sedKey}[[:space:]]*=[[:space:]]*)\S.*\$/\1${sedVal}/" \
"$newConfigFile"
if ! grep -qE "^${sedKey}[[:space:]]*=" "$newConfigFile"; then
+ sed -i -e '$a\' "$newConfigFile" # https://github.com/docker-library/rabbitmq/issues/456#issuecomment-752251872 (https://unix.stackexchange.com/a/31955/153467)
echo "$key = $val" >> "$newConfigFile"
fi
}
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index 178a4db..8585017 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
# The official Canonical Ubuntu Bionic image is ideal from a security perspective,
# especially for the enterprises that we, the RabbitMQ team, have to deal with
FROM ubuntu:18.04
@@ -18,13 +24,11 @@ ARG PGP_KEYSERVER=ha.pool.sks-keyservers.net
# run the build with a different PGP_KEYSERVER, e.g. docker build --tag rabbitmq:3.8 --build-arg PGP_KEYSERVER=pgpkeys.eu 3.8/ubuntu
# For context, see https://github.com/docker-library/official-images/issues/4252
-# Using the latest OpenSSL LTS release, with support until September 2023 - https://www.openssl.org/source/
ENV OPENSSL_VERSION 1.1.1i
ENV OPENSSL_SOURCE_SHA256="e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242"
# https://www.openssl.org/community/omc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-# Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
ENV OTP_VERSION 23.2.1
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
diff --git a/rabbitmq_latest/docker-entrypoint.sh b/rabbitmq_latest/docker-entrypoint.sh
index a06e709..da789b9 100755
--- a/rabbitmq_latest/docker-entrypoint.sh
+++ b/rabbitmq_latest/docker-entrypoint.sh
@@ -246,6 +246,7 @@ rabbit_set_config() {
"s/^[[:space:]]*(${sedKey}[[:space:]]*=[[:space:]]*)\S.*\$/\1${sedVal}/" \
"$newConfigFile"
if ! grep -qE "^${sedKey}[[:space:]]*=" "$newConfigFile"; then
+ sed -i -e '$a\' "$newConfigFile" # https://github.com/docker-library/rabbitmq/issues/456#issuecomment-752251872 (https://unix.stackexchange.com/a/31955/153467)
echo "$key = $val" >> "$newConfigFile"
fi
}
diff --git a/rabbitmq_management-alpine/Dockerfile b/rabbitmq_management-alpine/Dockerfile
index 40d77e1..44ef60b 100644
--- a/rabbitmq_management-alpine/Dockerfile
+++ b/rabbitmq_management-alpine/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM rabbitmq:3.8-alpine
RUN rabbitmq-plugins enable --offline rabbitmq_management
diff --git a/rabbitmq_management/Dockerfile b/rabbitmq_management/Dockerfile
index e66d8ee..e1a3aea 100644
--- a/rabbitmq_management/Dockerfile
+++ b/rabbitmq_management/Dockerfile
@@ -1,3 +1,9 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
FROM rabbitmq:3.8
RUN rabbitmq-plugins enable --offline rabbitmq_management
@@ -24,7 +30,9 @@ RUN set -eux; \
' -- /plugins/rabbitmq_management-*.ez > /usr/local/bin/rabbitmqadmin; \
[ -s /usr/local/bin/rabbitmqadmin ]; \
chmod +x /usr/local/bin/rabbitmqadmin; \
- apt-get update; apt-get install -y --no-install-recommends python3; rm -rf /var/lib/apt/lists/*; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends python3; \
+ rm -rf /var/lib/apt/lists/*; \
rabbitmqadmin --version
EXPOSE 15671 15672
|
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: