From d905ac8d767fe3773d341263f0199373671f8bd9 Mon Sep 17 00:00:00 2001
From: zachary <zachary@zacharyboyd.nyc>
Date: Mon, 6 Jul 2015 14:32:02 -0400
Subject: [PATCH] removes docker from dockerfile

---
 Dockerfile | 2 --
 Makefile   | 3 ---
 README.md  | 3 ++-
 run.sh     | 3 +--
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f7f3552..9e74835 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,6 @@ RUN chmod +x /usr/local/bin/install_docker
 
 RUN bash /usr/local/bin/install_docker
 
-COPY docker /usr/bin/docker
-
 COPY ./dind/wrapdocker /usr/local/bin/wrapdocker
 
 RUN chmod +x /usr/local/bin/wrapdocker
diff --git a/Makefile b/Makefile
index 0857212..125bb70 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,5 @@ dind:
 .drone.yml:
 	wget -qO- http://bit.ly/drone-yml-php | php > .drone.yml
 
-docker:
-	cp -aruv /usr/bin/docker docker
-
 install:
 	docker build -t znetstar/tor-router:0.0.1 .
\ No newline at end of file
diff --git a/README.md b/README.md
index 0267656..b7f9e8d 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,8 @@ Creates multiple instances of Tor and switches between them in a round-robin fas
 Based on Docker, HAProxy and of course Tor
 
 Run using 
-   ./run.sh
+   TOR_INSTANCES=5 TOR_PORT=9050 docker run --rm -it -e TOR_INSTANCES=$TOR_INSTANCES -e TOR_PORT=$TOR_PORT --name tor-router --privileged -v /tmp:/tmp -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker -v /usr/bin/docker:/usr/bin/docker:ro znetstar/tor-router:0.0.1
+
 
 Use the enviornment variable TOR_INSTANCES to set how many instances of Tor you'd like to run
 Use the enviornment variable TOR_PORT to set the port you'd like to connect to. The TOR_PORT variable can also be an ip address and port (TOR_PORT=127.0.0.1:9050)
diff --git a/run.sh b/run.sh
index 70ae0df..c94f9e9 100755
--- a/run.sh
+++ b/run.sh
@@ -31,6 +31,5 @@ apt-get install -y lxc-docker-1.5.0
 # END: docker installer
 
 echo 'starting up tor-router...'
-/usr/bin/docker run --rm -it -e TOR_INSTANCES=$TOR_INSTANCES -e TOR_PORT=$TOR_PORT --name tor-router --privileged -v /tmp:/tmp -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker znetstar/tor-router:0.0.1
-
+/usr/bin/docker run --rm -it -e TOR_INSTANCES=$TOR_INSTANCES -e TOR_PORT=$TOR_PORT --name tor-router --privileged -v /tmp:/tmp -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker -v /usr/bin/docker:/usr/bin/docker:ro znetstar/tor-router:0.0.1
 exit 0
\ No newline at end of file