mirror of
https://github.com/jessfraz/dockerfiles.git
synced 2024-11-23 11:31:49 +01:00
update tor-browser
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
parent
ee14191b88
commit
f90ec31fa5
|
@ -18,8 +18,9 @@ RUN apt-get update && apt-get install -y \
|
|||
libasound2 \
|
||||
libdbus-glib-1-2 \
|
||||
libgtk2.0-0 \
|
||||
libx11-xcb-dev \
|
||||
libxrender1 \
|
||||
libx11-xcb-dev \
|
||||
libx11-xcb1 \
|
||||
libxt6 \
|
||||
xz-utils \
|
||||
--no-install-recommends \
|
||||
|
@ -32,21 +33,27 @@ RUN useradd --create-home --home-dir $HOME user \
|
|||
ENV LANG C.UTF-8
|
||||
|
||||
# https://www.torproject.org/projects/torbrowser.html.en
|
||||
ENV TOR_VERSION 7.5a9
|
||||
ENV TOR_VERSION 8.0a1
|
||||
ENV TOR_FINGERPRINT 0x4E2C6E8793298290
|
||||
|
||||
# download tor and check signature
|
||||
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} \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& 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 tor-browser* "$GNUPGHOME" \
|
||||
&& chown -R user:user /usr/local/bin
|
||||
|
||||
# good fonts
|
||||
COPY local.conf /etc/fonts/local.conf
|
||||
|
|
|
@ -40,7 +40,7 @@ ENV TOR_FINGERPRINT 0x4E2C6E8793298290
|
|||
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 \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& for server in $(shuf -e \
|
||||
ha.pool.sks-keyservers.net \
|
||||
hkp://p80.pool.sks-keyservers.net:80 \
|
||||
|
@ -52,11 +52,9 @@ RUN cd /tmp \
|
|||
&& 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 tor-browser* "$GNUPGHOME" \
|
||||
&& chown -R user:user /usr/local/bin
|
||||
|
||||
|
||||
# good fonts
|
||||
COPY local.conf /etc/fonts/local.conf
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user