Revert "refactor: pass procfs location to docker_tls_args on command line"
changed my mind
This reverts commit be8260ae79.
This commit is contained in:
1 parent
4a6b72c649
commit
d59594c6b0
2 files changed
+6
-5
No files matched your search
@@ -1,5 +1,6 @@
|
||||
// docker_tls_args: find the docker daemon's tls args
|
||||
// This reimplements pgrep, because pgrep will only look in /proc.
|
||||
// This reimplements pgrep, because pgrep will only look in /proc, but not in
|
||||
// $PROCFS.
|
||||
package main
|
||||
|
||||
import (
|
||||
@@ -13,9 +14,9 @@ import (
|
||||
)
|
||||
|
||||
func main() {
|
||||
procRoot := "/proc"
|
||||
if len(os.Args) > 1 {
|
||||
procRoot = os.Args[1]
|
||||
procRoot := os.Getenv("PROCFS")
|
||||
if procRoot == "" {
|
||||
procRoot = "/proc"
|
||||
}
|
||||
|
||||
dirEntries, err := ioutil.ReadDir(procRoot)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user