From a6cb36022a5c1a17df78cfafe45a73d941ad4eb8 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 6 Jun 2017 06:55:36 -0700 Subject: [PATCH] Account for unbound variables --- 3.6/alpine/docker-entrypoint.sh | 4 ++-- 3.6/debian/docker-entrypoint.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3.6/alpine/docker-entrypoint.sh b/3.6/alpine/docker-entrypoint.sh index 8cb959cf..881c9413 100755 --- a/3.6/alpine/docker-entrypoint.sh +++ b/3.6/alpine/docker-entrypoint.sh @@ -398,8 +398,8 @@ if [ "$haveSslConfig" ] && [ -f "$combinedSsl" ]; then # clustered SSL-enabled members will talk nicely export ERL_SSL_PATH="$(erl -eval 'io:format("~p", [code:lib_dir(ssl, ebin)]),halt().' -noshell)" 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" - export RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS $sslErlArgs" - export RABBITMQ_CTL_ERL_ARGS="$RABBITMQ_CTL_ERL_ARGS $sslErlArgs" + export RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS:-} $sslErlArgs" + export RABBITMQ_CTL_ERL_ARGS="${RABBITMQ_CTL_ERL_ARGS:-} $sslErlArgs" fi exec "$@" diff --git a/3.6/debian/docker-entrypoint.sh b/3.6/debian/docker-entrypoint.sh index 8a117aaf..34307f19 100755 --- a/3.6/debian/docker-entrypoint.sh +++ b/3.6/debian/docker-entrypoint.sh @@ -398,8 +398,8 @@ if [ "$haveSslConfig" ] && [ -f "$combinedSsl" ]; then # clustered SSL-enabled members will talk nicely export ERL_SSL_PATH="$(erl -eval 'io:format("~p", [code:lib_dir(ssl, ebin)]),halt().' -noshell)" 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" - export RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS $sslErlArgs" - export RABBITMQ_CTL_ERL_ARGS="$RABBITMQ_CTL_ERL_ARGS $sslErlArgs" + export RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS:-} $sslErlArgs" + export RABBITMQ_CTL_ERL_ARGS="${RABBITMQ_CTL_ERL_ARGS:-} $sslErlArgs" fi exec "$@"