Update rabbitmq #10487
Merged
Update rabbitmq #10487
Conversation
This file contains hidden or 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@54eb927: Merge pull request docker-library/rabbitmq#467 from infosiftr/3.9-prep - docker-library/rabbitmq@59789a4: Entrpoint err/exit when deprecated env vars are detected - docker-library/rabbitmq@67d0569: Drop env config in 3.9 - docker-library/rabbitmq@0d1c84a: Add 3.9-rc - docker-library/rabbitmq@e3e7217: Update 3.8 to 3.8.19
Diff for 66e5a4f:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 592ed0f..94c2b89 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,42 +1,42 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/rabbitmq.git
-Tags: 3.8.18, 3.8, 3, latest
+Tags: 3.8.19, 3.8, 3, latest
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 5414666458771b001884ac5c5691bf84b8e6748d
+GitCommit: 67d05697020c3439aa45aaeadc9a23922a21b92c
Directory: 3.8/ubuntu
-Tags: 3.8.18-alpine, 3.8-alpine, 3-alpine, alpine
+Tags: 3.8.19-alpine, 3.8-alpine, 3-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5414666458771b001884ac5c5691bf84b8e6748d
+GitCommit: 67d05697020c3439aa45aaeadc9a23922a21b92c
Directory: 3.8/alpine
-Tags: 3.8.18-management, 3.8-management, 3-management, management
+Tags: 3.8.19-management, 3.8-management, 3-management, management
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 7e63843da6bfb191ddee6dbe3dd7ec0df36ae70b
+GitCommit: 0d1c84a50aa69305b2fa3e98632a206d3d2a3f9f
Directory: 3.8/ubuntu/management
-Tags: 3.8.18-management-alpine, 3.8-management-alpine, 3-management-alpine, management-alpine
+Tags: 3.8.19-management-alpine, 3.8-management-alpine, 3-management-alpine, management-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7e63843da6bfb191ddee6dbe3dd7ec0df36ae70b
+GitCommit: 0d1c84a50aa69305b2fa3e98632a206d3d2a3f9f
Directory: 3.8/alpine/management
-Tags: 3.8.19-rc.1, 3.8-rc
+Tags: 3.9.0-beta.2, 3.9-rc
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 20914d6baab98dead804ee050fe5271cf1098369
-Directory: 3.8-rc/ubuntu
+GitCommit: 59789a4a764d3fcf63be8651c05dbfcecfa7ac10
+Directory: 3.9-rc/ubuntu
-Tags: 3.8.19-rc.1-alpine, 3.8-rc-alpine
+Tags: 3.9.0-beta.2-alpine, 3.9-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 20914d6baab98dead804ee050fe5271cf1098369
-Directory: 3.8-rc/alpine
+GitCommit: 59789a4a764d3fcf63be8651c05dbfcecfa7ac10
+Directory: 3.9-rc/alpine
-Tags: 3.8.19-rc.1-management, 3.8-rc-management
+Tags: 3.9.0-beta.2-management, 3.9-rc-management
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 7e63843da6bfb191ddee6dbe3dd7ec0df36ae70b
-Directory: 3.8-rc/ubuntu/management
+GitCommit: 0d1c84a50aa69305b2fa3e98632a206d3d2a3f9f
+Directory: 3.9-rc/ubuntu/management
-Tags: 3.8.19-rc.1-management-alpine, 3.8-rc-management-alpine
+Tags: 3.9.0-beta.2-management-alpine, 3.9-rc-management-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7e63843da6bfb191ddee6dbe3dd7ec0df36ae70b
-Directory: 3.8-rc/alpine/management
+GitCommit: 0d1c84a50aa69305b2fa3e98632a206d3d2a3f9f
+Directory: 3.9-rc/alpine/management
diff --git a/_bashbrew-list b/_bashbrew-list
index 9e27f2c..4d92d3a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,18 +6,18 @@ rabbitmq:3.8
rabbitmq:3.8-alpine
rabbitmq:3.8-management
rabbitmq:3.8-management-alpine
-rabbitmq:3.8-rc
-rabbitmq:3.8-rc-alpine
-rabbitmq:3.8-rc-management
-rabbitmq:3.8-rc-management-alpine
-rabbitmq:3.8.18
-rabbitmq:3.8.18-alpine
-rabbitmq:3.8.18-management
-rabbitmq:3.8.18-management-alpine
-rabbitmq:3.8.19-rc.1
-rabbitmq:3.8.19-rc.1-alpine
-rabbitmq:3.8.19-rc.1-management
-rabbitmq:3.8.19-rc.1-management-alpine
+rabbitmq:3.8.19
+rabbitmq:3.8.19-alpine
+rabbitmq:3.8.19-management
+rabbitmq:3.8.19-management-alpine
+rabbitmq:3.9-rc
+rabbitmq:3.9-rc-alpine
+rabbitmq:3.9-rc-management
+rabbitmq:3.9-rc-management-alpine
+rabbitmq:3.9.0-beta.2
+rabbitmq:3.9.0-beta.2-alpine
+rabbitmq:3.9.0-beta.2-management
+rabbitmq:3.9.0-beta.2-management-alpine
rabbitmq:alpine
rabbitmq:latest
rabbitmq:management
diff --git a/rabbitmq_3.8-rc-alpine/docker-entrypoint.sh b/rabbitmq_3.8-rc-alpine/docker-entrypoint.sh
deleted file mode 100755
index 0a97523..0000000
diff --git a/rabbitmq_3.8-rc/docker-entrypoint.sh b/rabbitmq_3.8-rc/docker-entrypoint.sh
deleted file mode 100755
index 7f1ded5..0000000
diff --git a/rabbitmq_3.8-rc-alpine/Dockerfile b/rabbitmq_3.9-rc-alpine/Dockerfile
similarity index 99%
rename from rabbitmq_3.8-rc-alpine/Dockerfile
rename to rabbitmq_3.9-rc-alpine/Dockerfile
index b947f71..db87adf 100644
--- a/rabbitmq_3.8-rc-alpine/Dockerfile
+++ b/rabbitmq_3.9-rc-alpine/Dockerfile
@@ -185,7 +185,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.8.19-rc.1
+ENV RABBITMQ_VERSION 3.9.0-beta.2
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
ENV RABBITMQ_HOME=/opt/rabbitmq
diff --git a/rabbitmq_3.9-rc-alpine/docker-entrypoint.sh b/rabbitmq_3.9-rc-alpine/docker-entrypoint.sh
new file mode 100755
index 0000000..4009d3d
--- /dev/null
+++ b/rabbitmq_3.9-rc-alpine/docker-entrypoint.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# allow the container to be started with `--user`
+if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
+ if [ "$1" = 'rabbitmq-server' ]; then
+ find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
+ fi
+
+ exec su-exec rabbitmq "$BASH_SOURCE" "$@"
+fi
+
+deprecatedEnvVars=(
+ RABBITMQ_DEFAULT_PASS
+ RABBITMQ_DEFAULT_PASS_FILE
+ RABBITMQ_DEFAULT_USER
+ RABBITMQ_DEFAULT_USER_FILE
+ RABBITMQ_DEFAULT_VHOST
+ RABBITMQ_MANAGEMENT_SSL_CACERTFILE
+ RABBITMQ_MANAGEMENT_SSL_CERTFILE
+ RABBITMQ_MANAGEMENT_SSL_DEPTH
+ RABBITMQ_MANAGEMENT_SSL_FAIL_IF_NO_PEER_CERT
+ RABBITMQ_MANAGEMENT_SSL_KEYFILE
+ RABBITMQ_MANAGEMENT_SSL_VERIFY
+ RABBITMQ_SSL_CACERTFILE
+ RABBITMQ_SSL_CERTFILE
+ RABBITMQ_SSL_DEPTH
+ RABBITMQ_SSL_FAIL_IF_NO_PEER_CERT
+ RABBITMQ_SSL_KEYFILE
+ RABBITMQ_SSL_VERIFY
+ RABBITMQ_VM_MEMORY_HIGH_WATERMARK
+)
+hasOldEnv=
+for old in "${deprecatedEnvVars[@]}"; do
+ if [ -n "${!old:-}" ]; then
+ echo >&2 "error: $old is set but deprecated"
+ hasOldEnv=1
+ fi
+done
+if [ -n "$hasOldEnv" ]; then
+ echo >&2 'error: deprecated environment variables detected'
+ echo >&2
+ echo >&2 'Please use a configuration file instead; visit https://www.rabbitmq.com/configure.html to learn more'
+ echo >&2
+ exit 1
+fi
+
+# if long and short hostnames are not the same, use long hostnames
+if [ -z "${RABBITMQ_USE_LONGNAME:-}" ] && [ "$(hostname)" != "$(hostname -s)" ]; then
+ : "${RABBITMQ_USE_LONGNAME:=true}"
+fi
+
+exec "$@"
diff --git a/rabbitmq_3.8-rc-management-alpine/Dockerfile b/rabbitmq_3.9-rc-management-alpine/Dockerfile
similarity index 38%
rename from rabbitmq_3.8-rc-management-alpine/Dockerfile
rename to rabbitmq_3.9-rc-management-alpine/Dockerfile
index 73e53cf..6424069 100644
--- a/rabbitmq_3.8-rc-management-alpine/Dockerfile
+++ b/rabbitmq_3.9-rc-management-alpine/Dockerfile
@@ -4,30 +4,15 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM rabbitmq:3.8-rc-alpine
-
-RUN rabbitmq-plugins enable --offline rabbitmq_management
+FROM rabbitmq:3.9-rc-alpine
+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)
-RUN rm -f /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
-
-# extract "rabbitmqadmin" from inside the "rabbitmq_management-X.Y.Z.ez" plugin zipfile
+ rm -f /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf; \
+# grab "rabbitmqadmin" from inside the "rabbitmq_management-X.Y.Z" plugin folder
# see https://github.com/docker-library/rabbitmq/issues/207
-RUN set -eux; \
- erl -noinput -eval ' \
- { ok, AdminBin } = zip:foldl(fun(FileInArchive, GetInfo, GetBin, Acc) -> \
- case Acc of \
- "" -> \
- case lists:suffix("/rabbitmqadmin", FileInArchive) of \
- true -> GetBin(); \
- false -> Acc \
- end; \
- _ -> Acc \
- end \
- end, "", init:get_plain_arguments()), \
- io:format("~s", [ AdminBin ]), \
- init:stop(). \
- ' -- /plugins/rabbitmq_management-*.ez > /usr/local/bin/rabbitmqadmin; \
+ cp /plugins/rabbitmq_management-*/priv/www/cli/rabbitmqadmin /usr/local/bin/rabbitmqadmin; \
[ -s /usr/local/bin/rabbitmqadmin ]; \
chmod +x /usr/local/bin/rabbitmqadmin; \
apk add --no-cache python3; \
diff --git a/rabbitmq_3.8-rc-management/Dockerfile b/rabbitmq_3.9-rc-management/Dockerfile
similarity index 42%
rename from rabbitmq_3.8-rc-management/Dockerfile
rename to rabbitmq_3.9-rc-management/Dockerfile
index cd99f5a..f33f187 100644
--- a/rabbitmq_3.8-rc-management/Dockerfile
+++ b/rabbitmq_3.9-rc-management/Dockerfile
@@ -4,30 +4,15 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM rabbitmq:3.8-rc
-
-RUN rabbitmq-plugins enable --offline rabbitmq_management
+FROM rabbitmq:3.9-rc
+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)
-RUN rm -f /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
-
-# extract "rabbitmqadmin" from inside the "rabbitmq_management-X.Y.Z.ez" plugin zipfile
+ rm -f /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf; \
+# grab "rabbitmqadmin" from inside the "rabbitmq_management-X.Y.Z" plugin folder
# see https://github.com/docker-library/rabbitmq/issues/207
-RUN set -eux; \
- erl -noinput -eval ' \
- { ok, AdminBin } = zip:foldl(fun(FileInArchive, GetInfo, GetBin, Acc) -> \
- case Acc of \
- "" -> \
- case lists:suffix("/rabbitmqadmin", FileInArchive) of \
- true -> GetBin(); \
- false -> Acc \
- end; \
- _ -> Acc \
- end \
- end, "", init:get_plain_arguments()), \
- io:format("~s", [ AdminBin ]), \
- init:stop(). \
- ' -- /plugins/rabbitmq_management-*.ez > /usr/local/bin/rabbitmqadmin; \
+ cp /plugins/rabbitmq_management-*/priv/www/cli/rabbitmqadmin /usr/local/bin/rabbitmqadmin; \
[ -s /usr/local/bin/rabbitmqadmin ]; \
chmod +x /usr/local/bin/rabbitmqadmin; \
apt-get update; \
diff --git a/rabbitmq_3.8-rc/Dockerfile b/rabbitmq_3.9-rc/Dockerfile
similarity index 99%
rename from rabbitmq_3.8-rc/Dockerfile
rename to rabbitmq_3.9-rc/Dockerfile
index 5863065..b0a2535 100644
--- a/rabbitmq_3.8-rc/Dockerfile
+++ b/rabbitmq_3.9-rc/Dockerfile
@@ -196,7 +196,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.8.19-rc.1
+ENV RABBITMQ_VERSION 3.9.0-beta.2
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
ENV RABBITMQ_HOME=/opt/rabbitmq
diff --git a/rabbitmq_3.9-rc/docker-entrypoint.sh b/rabbitmq_3.9-rc/docker-entrypoint.sh
new file mode 100755
index 0000000..5161e8e
--- /dev/null
+++ b/rabbitmq_3.9-rc/docker-entrypoint.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# allow the container to be started with `--user`
+if [[ "$1" == rabbitmq* ]] && [ "$(id -u)" = '0' ]; then
+ if [ "$1" = 'rabbitmq-server' ]; then
+ find /var/lib/rabbitmq \! -user rabbitmq -exec chown rabbitmq '{}' +
+ fi
+
+ exec gosu rabbitmq "$BASH_SOURCE" "$@"
+fi
+
+deprecatedEnvVars=(
+ RABBITMQ_DEFAULT_PASS
+ RABBITMQ_DEFAULT_PASS_FILE
+ RABBITMQ_DEFAULT_USER
+ RABBITMQ_DEFAULT_USER_FILE
+ RABBITMQ_DEFAULT_VHOST
+ RABBITMQ_MANAGEMENT_SSL_CACERTFILE
+ RABBITMQ_MANAGEMENT_SSL_CERTFILE
+ RABBITMQ_MANAGEMENT_SSL_DEPTH
+ RABBITMQ_MANAGEMENT_SSL_FAIL_IF_NO_PEER_CERT
+ RABBITMQ_MANAGEMENT_SSL_KEYFILE
+ RABBITMQ_MANAGEMENT_SSL_VERIFY
+ RABBITMQ_SSL_CACERTFILE
+ RABBITMQ_SSL_CERTFILE
+ RABBITMQ_SSL_DEPTH
+ RABBITMQ_SSL_FAIL_IF_NO_PEER_CERT
+ RABBITMQ_SSL_KEYFILE
+ RABBITMQ_SSL_VERIFY
+ RABBITMQ_VM_MEMORY_HIGH_WATERMARK
+)
+hasOldEnv=
+for old in "${deprecatedEnvVars[@]}"; do
+ if [ -n "${!old:-}" ]; then
+ echo >&2 "error: $old is set but deprecated"
+ hasOldEnv=1
+ fi
+done
+if [ -n "$hasOldEnv" ]; then
+ echo >&2 'error: deprecated environment variables detected'
+ echo >&2
+ echo >&2 'Please use a configuration file instead; visit https://www.rabbitmq.com/configure.html to learn more'
+ echo >&2
+ exit 1
+fi
+
+# if long and short hostnames are not the same, use long hostnames
+if [ -z "${RABBITMQ_USE_LONGNAME:-}" ] && [ "$(hostname)" != "$(hostname -s)" ]; then
+ : "${RABBITMQ_USE_LONGNAME:=true}"
+fi
+
+exec "$@"
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 02938c7..33c25af 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -185,7 +185,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.8.18
+ENV RABBITMQ_VERSION 3.8.19
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
ENV RABBITMQ_HOME=/opt/rabbitmq
diff --git a/rabbitmq_alpine/docker-entrypoint.sh b/rabbitmq_alpine/docker-entrypoint.sh
index 0a97523..29cd7a1 100755
--- a/rabbitmq_alpine/docker-entrypoint.sh
+++ b/rabbitmq_alpine/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu
# usage: file_env VAR [DEFAULT]
@@ -196,7 +196,7 @@ if [ "${RABBITMQ_ERLANG_COOKIE:-}" ]; then
fi
chmod 600 "$cookieFile"
- echo >&2 "WARNING: '$cookieFile' was populated from '\$RABBITMQ_ERLANG_COOKIE', which will no longer happen in a future release! (https://github.com/docker-library/rabbitmq/pull/424)"
+ echo >&2 "WARNING: '$cookieFile' was populated from '\$RABBITMQ_ERLANG_COOKIE', which will no longer happen in 3.9 and later! (https://github.com/docker-library/rabbitmq/pull/424)"
fi
configBase="${RABBITMQ_CONFIG_FILE:-/etc/rabbitmq/rabbitmq}"
@@ -396,7 +396,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
fi
fi
- echo >&2 "WARNING: 'docker-entrypoint.sh' generated/modified the RabbitMQ configuration file, which will no longer happen in a future release! (https://github.com/docker-library/rabbitmq/pull/424)"
+ echo >&2 "WARNING: 'docker-entrypoint.sh' generated/modified the RabbitMQ configuration file, which will no longer happen in 3.9 and later! (https://github.com/docker-library/rabbitmq/pull/424)"
echo >&2
echo >&2 "Generated end result, for reference:"
echo >&2 "------------------------------------"
@@ -414,7 +414,7 @@ if [ "$haveSslConfig" ] && [[ "$1" == rabbitmq* ]] && [ ! -f "$combinedSsl" ]; t
} > "$combinedSsl"
chmod 0400 "$combinedSsl"
- echo >&2 "WARNING: relying on 'docker-entrypoint.sh' generating a combined PEM certificate file, which will no longer happen in a future release! (https://github.com/docker-library/rabbitmq/pull/424)"
+ echo >&2 "WARNING: relying on 'docker-entrypoint.sh' generating a combined PEM certificate file, which will no longer happen in 3.9 and later! (https://github.com/docker-library/rabbitmq/pull/424)"
fi
if [ "$haveSslConfig" ] && [ -f "$combinedSsl" ]; then
# More ENV vars for make clustering happiness
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index 3d92998..b6f8219 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -196,7 +196,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.8.18
+ENV RABBITMQ_VERSION 3.8.19
# https://www.rabbitmq.com/signatures.html#importing-gpg
ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
ENV RABBITMQ_HOME=/opt/rabbitmq
diff --git a/rabbitmq_latest/docker-entrypoint.sh b/rabbitmq_latest/docker-entrypoint.sh
index 7f1ded5..a598c35 100755
--- a/rabbitmq_latest/docker-entrypoint.sh
+++ b/rabbitmq_latest/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
set -eu
# usage: file_env VAR [DEFAULT]
@@ -196,7 +196,7 @@ if [ "${RABBITMQ_ERLANG_COOKIE:-}" ]; then
fi
chmod 600 "$cookieFile"
- echo >&2 "WARNING: '$cookieFile' was populated from '\$RABBITMQ_ERLANG_COOKIE', which will no longer happen in a future release! (https://github.com/docker-library/rabbitmq/pull/424)"
+ echo >&2 "WARNING: '$cookieFile' was populated from '\$RABBITMQ_ERLANG_COOKIE', which will no longer happen in 3.9 and later! (https://github.com/docker-library/rabbitmq/pull/424)"
fi
configBase="${RABBITMQ_CONFIG_FILE:-/etc/rabbitmq/rabbitmq}"
@@ -396,7 +396,7 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
fi
fi
- echo >&2 "WARNING: 'docker-entrypoint.sh' generated/modified the RabbitMQ configuration file, which will no longer happen in a future release! (https://github.com/docker-library/rabbitmq/pull/424)"
+ echo >&2 "WARNING: 'docker-entrypoint.sh' generated/modified the RabbitMQ configuration file, which will no longer happen in 3.9 and later! (https://github.com/docker-library/rabbitmq/pull/424)"
echo >&2
echo >&2 "Generated end result, for reference:"
echo >&2 "------------------------------------"
@@ -414,7 +414,7 @@ if [ "$haveSslConfig" ] && [[ "$1" == rabbitmq* ]] && [ ! -f "$combinedSsl" ]; t
} > "$combinedSsl"
chmod 0400 "$combinedSsl"
- echo >&2 "WARNING: relying on 'docker-entrypoint.sh' generating a combined PEM certificate file, which will no longer happen in a future release! (https://github.com/docker-library/rabbitmq/pull/424)"
+ echo >&2 "WARNING: relying on 'docker-entrypoint.sh' generating a combined PEM certificate file, which will no longer happen in 3.9 and later! (https://github.com/docker-library/rabbitmq/pull/424)"
fi
if [ "$haveSslConfig" ] && [ -f "$combinedSsl" ]; then
# More ENV vars for make clustering happiness
diff --git a/rabbitmq_management-alpine/Dockerfile b/rabbitmq_management-alpine/Dockerfile
index 44ef60b..5f058d9 100644
--- a/rabbitmq_management-alpine/Dockerfile
+++ b/rabbitmq_management-alpine/Dockerfile
@@ -6,14 +6,12 @@
FROM rabbitmq:3.8-alpine
-RUN rabbitmq-plugins enable --offline rabbitmq_management
-
+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)
-RUN rm -f /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
-
+ rm -f /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf; \
# extract "rabbitmqadmin" from inside the "rabbitmq_management-X.Y.Z.ez" plugin zipfile
# see https://github.com/docker-library/rabbitmq/issues/207
-RUN set -eux; \
erl -noinput -eval ' \
{ ok, AdminBin } = zip:foldl(fun(FileInArchive, GetInfo, GetBin, Acc) -> \
case Acc of \
diff --git a/rabbitmq_management/Dockerfile b/rabbitmq_management/Dockerfile
index e1a3aea..3c38428 100644
--- a/rabbitmq_management/Dockerfile
+++ b/rabbitmq_management/Dockerfile
@@ -6,14 +6,12 @@
FROM rabbitmq:3.8
-RUN rabbitmq-plugins enable --offline rabbitmq_management
-
+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)
-RUN rm -f /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf
-
+ rm -f /etc/rabbitmq/conf.d/management_agent.disable_metrics_collector.conf; \
# extract "rabbitmqadmin" from inside the "rabbitmq_management-X.Y.Z.ez" plugin zipfile
# see https://github.com/docker-library/rabbitmq/issues/207
-RUN set -eux; \
erl -noinput -eval ' \
{ ok, AdminBin } = zip:foldl(fun(FileInArchive, GetInfo, GetBin, Acc) -> \
case Acc of \
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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: