From 523300f7bcdee18cc74ed52706615c9ea98827ad Mon Sep 17 00:00:00 2001 From: AntiTree Date: Sat, 9 Jul 2016 20:55:18 -0400 Subject: [PATCH 01/19] Hey, look who just learned about docker container layers. This guy. Reducing build size substantially --- Dockerfile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index d27fc40..985ea70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,20 +39,12 @@ RUN apt-get update && \ git" && \ DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install $build_deps \ init-system-helpers \ - pwgen - -# clone the latest from the tor repos -# Use the TOR_VER env var for the branch -RUN mkdir /src && \ + pwgen && \ + mkdir /src && \ cd /src && \ git clone https://git.torproject.org/tor.git && \ cd tor && \ - git checkout ${TOR_VER} - -# run autogen and build tor -# cleanup unnecessary files -# [OPTIONAL] clean up source -RUN cd /src/tor && \ + git checkout ${TOR_VER} && \ ./autogen.sh && \ ./configure --disable-asciidoc && \ make && \ From 2a5991fd86242c61c1151bc71aa1149bf3b3d9ae Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 13 Jul 2016 20:41:55 -0400 Subject: [PATCH 02/19] Switching from master branch because there is a current bug upstream related to tor-gencert --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 985ea70..3849e82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,8 +22,10 @@ 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="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 +ENV TOR_VER="release-0.2.8" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 125cb55f5d46cb425dfee37132ce1e52da1db5c9 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:37:20 -0400 Subject: [PATCH 03/19] Creating branch for maint-0.2.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3849e82..8fd6e59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="release-0.2.8" +ENV TOR_VER="maint-0.2.0" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 47a793b800b1877586881d584a2c23e37f0b9be6 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:37:23 -0400 Subject: [PATCH 04/19] Creating branch for maint-0.2.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8fd6e59..9056352 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="maint-0.2.0" +ENV TOR_VER="maint-0.2.1" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 389fdbcd8215926710b7c6494fb33ca8e18a2ba8 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:37:28 -0400 Subject: [PATCH 05/19] Creating branch for maint-0.2.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9056352..f02da23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="maint-0.2.1" +ENV TOR_VER="maint-0.2.2" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 02ccc592e64348765c28b6ae3d89a990ae1cd323 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:37:36 -0400 Subject: [PATCH 06/19] Creating branch for maint-0.2.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f02da23..c86c0a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="maint-0.2.2" +ENV TOR_VER="maint-0.2.3" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 944a3bd760d8a3f5198ea8df83a7aed941db3f30 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:37:48 -0400 Subject: [PATCH 07/19] Creating branch for maint-0.2.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c86c0a8..86c90aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="maint-0.2.3" +ENV TOR_VER="maint-0.2.4" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 5f6343cf2e2d7eb268beb0431e1814824c45cfd0 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:37:51 -0400 Subject: [PATCH 08/19] Creating branch for maint-0.2.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 86c90aa..c26eda0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="maint-0.2.4" +ENV TOR_VER="maint-0.2.5" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 3fc6c9cc6cd6102d7168fd9dab964789ec4159cc Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:37:59 -0400 Subject: [PATCH 09/19] Creating branch for maint-0.2.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c26eda0..9a9c6e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="maint-0.2.5" +ENV TOR_VER="maint-0.2.6" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 5ca645cf3576b5df2c4e7dbcce0eef3a75c2e6a6 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:38:04 -0400 Subject: [PATCH 10/19] Creating branch for maint-0.2.7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9a9c6e3..b4d07fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="maint-0.2.6" +ENV TOR_VER="maint-0.2.7" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 6a659ab22b82c7d5f7ffd0f7d291cc1bc49373e2 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:38:14 -0400 Subject: [PATCH 11/19] Creating branch for maint-0.2.8 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4d07fc..f51a2ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="maint-0.2.7" +ENV TOR_VER="maint-0.2.8" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From cd736229ad0e79cf3acbf3ff014204c7c565f787 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:38:22 -0400 Subject: [PATCH 12/19] Creating branch for release-0.2.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f51a2ec..e5a9930 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="maint-0.2.8" +ENV TOR_VER="release-0.2.1" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 1d3d1edcc3f10d7f628a44d3dde896138cceb6e6 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:38:24 -0400 Subject: [PATCH 13/19] Creating branch for release-0.2.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e5a9930..0d5ef80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="release-0.2.1" +ENV TOR_VER="release-0.2.2" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 95f15c99ebbcee35dfd020584a4fbaeccb49f5c1 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:38:31 -0400 Subject: [PATCH 14/19] Creating branch for release-0.2.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0d5ef80..49476ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="release-0.2.2" +ENV TOR_VER="release-0.2.3" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 1381f01d5c66e399bbc8b8e706eab15533f40f3e Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:38:34 -0400 Subject: [PATCH 15/19] Creating branch for release-0.2.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49476ac..49bf13b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="release-0.2.3" +ENV TOR_VER="release-0.2.4" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 062465f7d6ba5ba17afebca99b1d0aefae53cdc1 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:38:38 -0400 Subject: [PATCH 16/19] Creating branch for release-0.2.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49bf13b..8ab4fa8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="release-0.2.4" +ENV TOR_VER="release-0.2.5" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 3aa9b7a03c6249ecd98063c4f02fcf2333e637d8 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:38:41 -0400 Subject: [PATCH 17/19] Creating branch for release-0.2.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ab4fa8..4f68320 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="release-0.2.5" +ENV TOR_VER="release-0.2.6" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From f82324851afd98a73dafc9a0495f064ab7f5021e Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:38:44 -0400 Subject: [PATCH 18/19] Creating branch for release-0.2.7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4f68320..163862d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="release-0.2.6" +ENV TOR_VER="release-0.2.7" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients. From 83a4652ce9a999a013ca6fd9112bceac739fbde9 Mon Sep 17 00:00:00 2001 From: AntiTree Date: Wed, 20 Jul 2016 11:38:48 -0400 Subject: [PATCH 19/19] Creating branch for release-0.2.8 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 163862d..3849e82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ MAINTAINER Antitree antitree@protonmail.com #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 -ENV TOR_VER="release-0.2.7" +ENV TOR_VER="release-0.2.8" # Sets the nickname if you didn't set one, default ports, and the path # where to mount the key material used by the clients.