Merge pull request #337 from koep/master

Fix pgp related build errors
This commit is contained in:
Christian 2018-01-30 08:13:10 +01:00 committed by GitHub
commit 54f4cbc654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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