reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show expected error message when docker_tls_args fails.

Browse Source 
And also make the error message more meaningful.

Fixes #1843.
This commit is contained in:
Matthias Radestock committed 2015-12-31 10:05:41 +00:00
1 parent 281937cf82
commit 370212609c
1 file changed
+6 -2
Download Patch File Download Diff File Expand all files Collapse all files
weave
+6 -2
View File
@@ -1456,10 +1456,14 @@ proxy_args() {
proxy_parse_args "$@" proxy_parse_args "$@"
if [ -z "$PROXY_TLS_ENABLED" ] ; then if [ -z "$PROXY_TLS_ENABLED" ] ; then
if [ -z "$PROXY_TLS_DETECTION_DISABLED" ] && ! proxy_parse_args $(docker_tls_args) ; then if [ -z "$PROXY_TLS_DETECTION_DISABLED" ] ; then
echo "Unable to auto-detect TLS configuration, --no-detect-tls or TLS options are required." >&2 if ! DOCKER_TLS_ARGS=$(docker_tls_args) ; then
echo "Unable to auto-detect proxy TLS configuration; you must launch the proxy with" >&2
echo "'weave launch-proxy' and supply '--no-detect-tls' or TLS options." >&2
exit 1 exit 1
fi fi
proxy_parse_args "$DOCKER_TLS_ARGS"
fi
fi fi
if [ -z "$PROXY_HOST" ] ; then if [ -z "$PROXY_HOST" ] ; then
case "$DOCKER_CLIENT_HOST" in case "$DOCKER_CLIENT_HOST" in