From 7a4a7fbafc880a828899f28f5a3ee3a5f0970502 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Wed, 11 May 2016 11:25:56 +0200
Subject: [PATCH] Don't run the plugin, use tinycore & weavedns for tracer app

---
 experimental/example/run.sh               | 2 +-
 experimental/example/run_tracer.sh        | 4 ++++
 experimental/example/trace_app/Dockerfile | 2 +-
 experimental/example/trace_app/app.py     | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/experimental/example/run.sh b/experimental/example/run.sh
index dc6bf6cc5..0498cf5bf 100755
--- a/experimental/example/run.sh
+++ b/experimental/example/run.sh
@@ -5,7 +5,7 @@ set -ex
 readonly ARG="$1"
 
 if ! $(weave status 1>/dev/null 2>&1); then
-    weave launch
+    WEAVE_NO_PLUGIN=y weave launch
 fi
 
 eval $(weave env)
diff --git a/experimental/example/run_tracer.sh b/experimental/example/run_tracer.sh
index 302c29564..0be04dece 100755
--- a/experimental/example/run_tracer.sh
+++ b/experimental/example/run_tracer.sh
@@ -4,6 +4,10 @@ set -ex
 
 readonly ARG="$1"
 
+if ! $(weave status 1>/dev/null 2>&1); then
+    WEAVE_NO_PLUGIN=y weave launch
+fi
+
 eval $(weave env)
 
 start_container() {
diff --git a/experimental/example/trace_app/Dockerfile b/experimental/example/trace_app/Dockerfile
index c39037cd6..1f3d09610 100644
--- a/experimental/example/trace_app/Dockerfile
+++ b/experimental/example/trace_app/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2.7
+FROM tatsushid/tinycore-python:2.7
 MAINTAINER Weaveworks Inc <help@weave.works>
 WORKDIR /home/weave
 ADD requirements.txt /home/weave/
diff --git a/experimental/example/trace_app/app.py b/experimental/example/trace_app/app.py
index 11c992e4c..beff4e287 100644
--- a/experimental/example/trace_app/app.py
+++ b/experimental/example/trace_app/app.py
@@ -25,7 +25,7 @@ def do_redis():
 def do_qotd():
   s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
   try:
-    s.connect(("qotd", 4446))
+    s.connect(("qotd.weave.local", 4446))
     s.send("Hello")
     return s.recv(1024)
   finally:
@@ -38,7 +38,7 @@ def do_search():
   return r.text
 
 def do_echo(text):
-  r = requests.get("http://echo/", data=text)
+  r = requests.get("http://echo.weave.local/", data=text)
   return r.text
 
 def ignore_error(f):