From 43bb08e9702296107d36ec03f5e90ce92687f02f Mon Sep 17 00:00:00 2001 From: antitree Date: Wed, 24 May 2017 19:43:16 -0400 Subject: [PATCH 01/21] attributing Andrew Michael Smith --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f33ed0a..7f1cf71 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,7 @@ Here are a few things to try if you're runing into issues: This project is in no way associated with the Tor Project or their developers. Like many people I'm a fan of Tor and recommend considering ways you can help the project. Consider running a relay, donating, or writing code. -### References - +### Resources +- https://github.com/andrewmichaelsmith/private-tor-network-kube Used some of this work to port to a kubernetes config - https://github.com/chriswayg/tor-server - https://www.torproject.org/docs/tor-relay-debian.html.en From 8c9843eb1afedc9305cefb120a1dadf33223ae22 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 19:50:00 -0400 Subject: [PATCH 02/21] modified the way it looks for network interfaces to handle docker swarm --- scripts/docker-entrypoint | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/docker-entrypoint b/scripts/docker-entrypoint index 52af8b7..7da85d6 100755 --- a/scripts/docker-entrypoint +++ b/scripts/docker-entrypoint @@ -18,7 +18,10 @@ if [ ! -e /tor-config-done ]; then # Host specific modifications to the torrc file echo -e "DataDirectory ${TOR_DIR}/${TOR_NICKNAME}" >> /etc/tor/torrc - TOR_IP=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/') + # Updated to handle docker stack/swarm network overlays + TOR_IP=$(ip addr show eth1 | grep "inet" | grep -v '\/32'| awk '{print $2}' | cut -f1 -d'/') + NICS=$(ip addr | grep 'state UP' | awk '{print $2}' | cut -f1 -d':') + if echo "Address ${TOR_IP}" >> /etc/tor/torrc echo -e "ControlPort 0.0.0.0:9051" >> /etc/tor/torrc if [ -z "${TOR_CONTROL_PWD}" ]; then From 7f73417e955f9bc774fe15dc2a70e9eea367b165 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:04:48 -0400 Subject: [PATCH 03/21] Creating branch for maint-0.2.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ff5d5d9..15c7101 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="master" +ENV TOR_VER="maint-0.2.0" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From 6107f4f0313ca724f8043a4820854ca1f8c32ec5 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:05:32 -0400 Subject: [PATCH 04/21] Creating branch for maint-0.2.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 15c7101..00e7cc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="maint-0.2.0" +ENV TOR_VER="maint-0.2.1" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From 8335094c5e5dd13650511edca89541b465b2547a Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:05:36 -0400 Subject: [PATCH 05/21] Creating branch for maint-0.2.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 00e7cc2..be62f3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="maint-0.2.1" +ENV TOR_VER="maint-0.2.2" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From cf6a8d2e2971588dd3314b1d875249750c77ac8a Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:05:41 -0400 Subject: [PATCH 06/21] Creating branch for maint-0.2.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index be62f3f..baead9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="maint-0.2.2" +ENV TOR_VER="maint-0.2.3" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From 857ad746d749f6e9b2dd218b572a6363b4b37bde Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:05:45 -0400 Subject: [PATCH 07/21] Creating branch for maint-0.2.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index baead9b..ebf751b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="maint-0.2.3" +ENV TOR_VER="maint-0.2.4" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From df445609f2be319ded5846f2b7921a78aacd3ad7 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:05:49 -0400 Subject: [PATCH 08/21] Creating branch for maint-0.2.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ebf751b..2c6845a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="maint-0.2.4" +ENV TOR_VER="maint-0.2.5" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From c6176134959d8cd2ece4ee487e949fd3e23491cc Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:05:53 -0400 Subject: [PATCH 09/21] Creating branch for maint-0.2.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2c6845a..a726fdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="maint-0.2.5" +ENV TOR_VER="maint-0.2.6" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From 61667252f50aeb681cafcde2229a5542d2c9ba5b Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:07:47 -0400 Subject: [PATCH 10/21] Creating branch for release-0.2.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a726fdf..d0d650f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="maint-0.2.6" +ENV TOR_VER="release-0.2.1" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From dbc0c2bc32ab25a4c48a66b6ae0174b33a3fca67 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:07:51 -0400 Subject: [PATCH 11/21] Creating branch for release-0.2.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d0d650f..eeaf037 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.2.1" +ENV TOR_VER="release-0.2.2" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From 1628169f15756de38d049dfe9dfcda09dd0d25de Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:07:56 -0400 Subject: [PATCH 12/21] Creating branch for release-0.2.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eeaf037..b63d8f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.2.2" +ENV TOR_VER="release-0.2.3" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From fd064bf2d566230681260c15c279174a037bdc9c Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:08:00 -0400 Subject: [PATCH 13/21] Creating branch for release-0.2.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b63d8f5..1320184 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.2.3" +ENV TOR_VER="release-0.2.4" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From 91efa7aba43d2c08bce19eb2e8d0b3d707215f40 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:08:06 -0400 Subject: [PATCH 14/21] Creating branch for release-0.2.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1320184..d749ca7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.2.4" +ENV TOR_VER="release-0.2.5" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From 59a9e62e67be0ffaa66acc959d77670e5b64ce02 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:08:10 -0400 Subject: [PATCH 15/21] Creating branch for release-0.2.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d749ca7..a8c4bb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.2.5" +ENV TOR_VER="release-0.2.6" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From 45c5aecb986d832b80c707eb16b02de300a7eb70 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:08:14 -0400 Subject: [PATCH 16/21] Creating branch for release-0.2.7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a8c4bb2..71309f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.2.6" +ENV TOR_VER="release-0.2.7" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From 5bade690191675b671b13b87c049f4437134a41c Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:08:19 -0400 Subject: [PATCH 17/21] Creating branch for release-0.2.7-redux --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 71309f5..97a373f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.2.7" +ENV TOR_VER="release-0.2.7-redux" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From f1e2643a36a8eb95b2358b193d27b9aaf9734155 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:08:23 -0400 Subject: [PATCH 18/21] Creating branch for release-0.2.8 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 97a373f..fc10143 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.2.7-redux" +ENV TOR_VER="release-0.2.8" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From da4e9dd37942aa8587c30a626646f464e8cb2b6d Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:08:27 -0400 Subject: [PATCH 19/21] Creating branch for release-0.2.9 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fc10143..4cb1db9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.2.8" +ENV TOR_VER="release-0.2.9" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From db203915550e3d5d11e64de7bf989633e0392ef6 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:08:32 -0400 Subject: [PATCH 20/21] Creating branch for release-0.3.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4cb1db9..2f6fff3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.2.9" +ENV TOR_VER="release-0.3.0" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest From b90303fd3d8b3998974d307112240ec3d8f75f00 Mon Sep 17 00:00:00 2001 From: antitree Date: Sat, 8 Jul 2017 20:08:35 -0400 Subject: [PATCH 21/21] Creating branch for release-0.3.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2f6fff3..daa098a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ MAINTAINER Antitree antitree@protonmail.com # * tor-0.2.7.6 # * tor-0.2.7.5 # * release-0.2.1 -ENV TOR_VER="release-0.3.0" +ENV TOR_VER="release-0.3.1" #ENV TOR_VER="master" # NOTE sometimes the master branch doesn't compile so I'm sticking with the release # feel free to change this to master to get the latest and greatest