Skip to content

Commit 1efad3e

Browse files
committed
Add deprecation warnings to "docker-entrypoint.sh"
1 parent 6c78066 commit 1efad3e

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

docker-entrypoint.sh

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ for conf in "${!configDefaults[@]}"; do
179179
done
180180

181181
# if long and short hostnames are not the same, use long hostnames
182-
if [ "$(hostname)" != "$(hostname -s)" ]; then
182+
if [ -z "${RABBITMQ_USE_LONGNAME:-}" ] && [ "$(hostname)" != "$(hostname -s)" ]; then
183+
echo >&2 "WARNING: relying on 'docker-entrypoint.sh' implied 'RABBITMQ_USE_LONGNAME=true' setting, which will be removed in a future release! (https://github.com/docker-library/rabbitmq/pull/424)"
183184
: "${RABBITMQ_USE_LONGNAME:=true}"
184185
fi
185186

@@ -195,6 +196,10 @@ if [ "${RABBITMQ_ERLANG_COOKIE:-}" ]; then
195196
echo "$RABBITMQ_ERLANG_COOKIE" > "$cookieFile"
196197
fi
197198
chmod 600 "$cookieFile"
199+
200+
# TODO show warning about use of RABBITMQ_ERLANG_COOKIE variable ??
201+
# - https://github.com/docker-library/rabbitmq/pull/424#discussion_r459983266
202+
# - https://github.com/rabbitmq/rabbitmq-prometheus/commit/83cff5a4b80d4683a6a0a32db979ca00ec1774b3
198203
fi
199204

200205
configBase="${RABBITMQ_CONFIG_FILE:-/etc/rabbitmq/rabbitmq}"
@@ -390,6 +395,13 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$shouldWriteConfig" ]; then
390395
rabbit_set_config 'management.load_definitions' "$managementDefinitionsFile"
391396
fi
392397
fi
398+
399+
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)"
400+
echo >&2
401+
echo >&2 "Generated end result, for reference:"
402+
echo >&2 "------------------------------------"
403+
cat >&2 "$newConfigFile"
404+
echo >&2 "------------------------------------"
393405
fi
394406

395407
combinedSsl='/tmp/rabbitmq-ssl/combined.pem'
@@ -401,6 +413,8 @@ if [ "$haveSslConfig" ] && [[ "$1" == rabbitmq* ]] && [ ! -f "$combinedSsl" ]; t
401413
cat "$RABBITMQ_SSL_KEYFILE"
402414
} > "$combinedSsl"
403415
chmod 0400 "$combinedSsl"
416+
417+
echo >&2 "WARNING: relying on 'docker-entrypoint.sh' generating a combined SSL file, which will no longer happen in a future release! (https://github.com/docker-library/rabbitmq/pull/424)"
404418
fi
405419
if [ "$haveSslConfig" ] && [ -f "$combinedSsl" ]; then
406420
# More ENV vars for make clustering happiness
@@ -410,6 +424,8 @@ if [ "$haveSslConfig" ] && [ -f "$combinedSsl" ]; then
410424
sslErlArgs="-pa $ERL_SSL_PATH -proto_dist inet_tls -ssl_dist_opt server_certfile $combinedSsl -ssl_dist_opt server_secure_renegotiate true client_secure_renegotiate true"
411425
export RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS:-} $sslErlArgs"
412426
export RABBITMQ_CTL_ERL_ARGS="${RABBITMQ_CTL_ERL_ARGS:-} $sslErlArgs"
427+
428+
# (no WARNING here, because this will only happen if we already displayed the "combined SSL file" WARNING above, so it would be redundant)
413429
fi
414430

415431
exec "$@"

0 commit comments

Comments
 (0)