Revert "refactor: pass procfs location to docker_tls_args on command line"

changed my mind

This reverts commit be8260ae79.
This commit is contained in:
Matthias Radestock committed 2016-01-02 10:50:13 +00:00
1 parent 4a6b72c649
commit d59594c6b0
2 files changed
+6 -5

No files matched your search

+1 -1
View File
@@ -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 ${PROCFS:-/proc}) ; then
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