From 29c64b1f400ce4b96c66bc94b61fc510fb3a3cc1 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Wed, 19 Aug 2015 11:20:10 +0100 Subject: [PATCH] document `weave env --restore` leftover from #1327 --- site/proxy.md | 9 +++++++-- site/troubleshooting.md | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/site/proxy.md b/site/proxy.md index 5291032a..d81b592a 100644 --- a/site/proxy.md +++ b/site/proxy.md @@ -60,6 +60,10 @@ command for this: host1$ docker ps ... +The prior settings can be restored with + + host1$ eval "$(weave env --restore)" + Alternatively, the proxy host can be set on a per-command basis with host1$ docker $(weave config) ps @@ -70,8 +74,9 @@ The proxy can be stopped independently with or in conjunction with the router and weaveDNS via `stop`. -If you set your `DOCKER_HOST` to point at the proxy, remember to -revert to the original setting. +If you set your `DOCKER_HOST` to point at the proxy, you should revert +to the original settings prior to stopping the proxy. + ## Usage diff --git a/site/troubleshooting.md b/site/troubleshooting.md index f2667daf..a8927c3e 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -37,7 +37,13 @@ Another useful debugging technique is to attach standard packet capture and analysis tools, such as tcpdump and wireshark, to the `weave` network bridge on the host. -To stop weave, run +To stop weave, if you have configured your environment to use the +Weave Docker API Proxy, e.g. by running `eval $(weave env)` in your +shell, you must first restore the environment with + + eval $(weave env --restore) + +Then run weave stop