From 217b68c76412e3d1adf89007fd74a585a8ba8c88 Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Fri, 12 Feb 2016 13:54:49 +0000
Subject: [PATCH 1/2] overwrite /etc/weave/apps, because it might already exist

---
 docker/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 9681d8856..aa5ef275e 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -85,6 +85,6 @@ if [ "$MANUAL_APPS" = "" -a "$TOKEN_PROVIDED" = "true" ]; then
     MANUAL_APPS="scope.weave.works:443"
 fi
 
-echo "$MANUAL_APPS" >>/etc/weave/apps
+echo "$MANUAL_APPS" >/etc/weave/apps
 
 exec /home/weave/runsvinit

From d4c628082073b446e709a948bf035ccbd59051c4 Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Fri, 12 Feb 2016 15:51:17 +0000
Subject: [PATCH 2/2] Review Feedback: Stick args in /var/run/weave

---
 docker/entrypoint.sh | 10 +++++-----
 docker/run-app       |  2 +-
 docker/run-probe     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index aa5ef275e..d1acee793 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -5,7 +5,7 @@ usage() {
 	exit 1
 }
 
-mkdir -p /etc/weave
+mkdir -p /var/run/weave
 APP_ARGS=""
 PROBE_ARGS=""
 TOKEN_PROVIDED=false
@@ -70,12 +70,12 @@ while true; do
     shift
 done
 
-echo "$APP_ARGS" >/etc/weave/scope-app.args
-echo "$PROBE_ARGS" >/etc/weave/scope-probe.args
+echo "$APP_ARGS" >/var/run/weave/scope-app.args
+echo "$PROBE_ARGS" >/var/run/weave/scope-probe.args
 
 # End of the command line can optionally be some
 # addresses of apps to connect to, for people not
-# using Weave DNS. We stick these in /etc/weave/apps
+# using Weave DNS. We stick these in /var/run/weave/apps
 # for the run-probe script to pick up.
 MANUAL_APPS=$@
 
@@ -85,6 +85,6 @@ if [ "$MANUAL_APPS" = "" -a "$TOKEN_PROVIDED" = "true" ]; then
     MANUAL_APPS="scope.weave.works:443"
 fi
 
-echo "$MANUAL_APPS" >/etc/weave/apps
+echo "$MANUAL_APPS" >/var/run/weave/apps
 
 exec /home/weave/runsvinit
diff --git a/docker/run-app b/docker/run-app
index 9426a1f31..93b0e0713 100755
--- a/docker/run-app
+++ b/docker/run-app
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec -a scope-app /home/weave/scope app $(cat /etc/weave/scope-app.args)
+exec -a scope-app /home/weave/scope app $(cat /var/run/weave/scope-app.args)
diff --git a/docker/run-probe b/docker/run-probe
index 3553720fc..929e6d824 100755
--- a/docker/run-probe
+++ b/docker/run-probe
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec -a scope-probe /home/weave/scope probe $(cat /etc/weave/scope-probe.args) $(cat /etc/weave/apps)
+exec -a scope-probe /home/weave/scope probe $(cat /var/run/weave/scope-probe.args) $(cat /var/run/weave/apps)