refactor: pass procfs location to docker_tls_args on command line
...rather than via an env var. This is cleaner.
This commit is contained in:
1 parent
9c31de9cb9
commit
be8260ae79
2 files changed
+5
-6
No files matched your search
@@ -1435,7 +1435,7 @@ proxy_args() {
|
||||
proxy_parse_args "$@"
|
||||
|
||||
if [ -z "$PROXY_TLS_ENABLED" -a -z "$PROXY_TLS_DETECTION_DISABLED" ] && command_exists docker_tls_args ; then
|
||||
if ! DOCKER_TLS_ARGS=$(docker_tls_args) ; then
|
||||
if ! DOCKER_TLS_ARGS=$(docker_tls_args ${PROCFS:-/proc}) ; 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
|
||||
|
||||
Reference in new issue
Block a user