From e935a920f576da1c5f8fea73b17e80cdbdba727c Mon Sep 17 00:00:00 2001
From: Christian Koep <christiankoep@gmail.com>
Date: Fri, 26 Jan 2018 08:21:48 +0100
Subject: [PATCH] Fix pgp related build errors and permission issue

---
 tor-browser/stable/Dockerfile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tor-browser/stable/Dockerfile b/tor-browser/stable/Dockerfile
index 03d7a48..52849f2 100644
--- a/tor-browser/stable/Dockerfile
+++ b/tor-browser/stable/Dockerfile
@@ -41,12 +41,20 @@ RUN cd /tmp \
 	&& curl -sSOL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz" \
 	&& curl -sSOL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc" \
 	&& mkdir ~/.gnupg \
-	&& gpg --no-tty --keyserver "pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} \
+	&& for server in $(shuf -e \
+			ha.pool.sks-keyservers.net \
+			hkp://p80.pool.sks-keyservers.net:80 \
+			keyserver.ubuntu.com \
+			hkp://keyserver.ubuntu.com:80 \
+			pgp.mit.edu) ; do \
+		gpg --no-tty --keyserver "pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} && break || : ; \
+	done \
 	&& gpg --fingerprint --keyid-format LONG ${TOR_FINGERPRINT} | grep "Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290" \
 	&& gpg --verify tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc \
 	&& tar -vxJ --strip-components 1 -C /usr/local/bin -f tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz \
 	&& rm -rf tor-browser* \
-	&& rm -rf ~/.gnupg
+	&& rm -rf ~/.gnupg \
+	&& chown -R user:user /usr/local/bin
 
 
 # good fonts