docker-library
/
rabbitmq
mirror of https://github.com/docker-library/rabbitmq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159 from infosiftr/RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS 

Adjust entrypoint to be more respectful to existing RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS values
This commit is contained in:
yosifkit 2017-06-01 13:43:41 -07:00 committed by GitHub
parent 58ff0d1f13 4761fd0c03
commit 061038d6cd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3.6/alpine/docker-entrypoint.sh
View File

@ -397,8 +397,9 @@ if [ "$haveSslConfig" ] && [ -f "$combinedSsl" ]; then
# we don't handle clustering in this script, but these args should ensure # we don't handle clustering in this script, but these args should ensure
# clustered SSL-enabled members will talk nicely # clustered SSL-enabled members will talk nicely
export ERL_SSL_PATH="$(erl -eval 'io:format("~p", [code:lib_dir(ssl, ebin)]),halt().' -noshell)" export ERL_SSL_PATH="$(erl -eval 'io:format("~p", [code:lib_dir(ssl, ebin)]),halt().' -noshell)"
export RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-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" 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_CTL_ERL_ARGS="$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS" export RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS $sslErlArgs"
export RABBITMQ_CTL_ERL_ARGS="$RABBITMQ_CTL_ERL_ARGS $sslErlArgs"
fi fi
exec "$@" exec "$@"

5
3.6/debian/docker-entrypoint.sh
View File

@ -397,8 +397,9 @@ if [ "$haveSslConfig" ] && [ -f "$combinedSsl" ]; then
# we don't handle clustering in this script, but these args should ensure # we don't handle clustering in this script, but these args should ensure
# clustered SSL-enabled members will talk nicely # clustered SSL-enabled members will talk nicely
export ERL_SSL_PATH="$(erl -eval 'io:format("~p", [code:lib_dir(ssl, ebin)]),halt().' -noshell)" export ERL_SSL_PATH="$(erl -eval 'io:format("~p", [code:lib_dir(ssl, ebin)]),halt().' -noshell)"
export RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-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" 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_CTL_ERL_ARGS="$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS" export RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS $sslErlArgs"
export RABBITMQ_CTL_ERL_ARGS="$RABBITMQ_CTL_ERL_ARGS $sslErlArgs"
fi fi
exec "$@" exec "$@"