xZero707/dockerfiles
1
0
Fork 0
mirror of https://github.com/jessfraz/dockerfiles.git synced 2024-11-23 11:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

update tor-browser

Browse Source 
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
Jess Frazelle 2018-02-03 20:41:33 -05:00
parent ee14191b88
commit f90ec31fa5
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tor-browser/alpha/Dockerfile
View File

@ -18,8 +18,9 @@ RUN apt-get update && apt-get install -y \
libasound2 \ libasound2 \
libdbus-glib-1-2 \ libdbus-glib-1-2 \
libgtk2.0-0 \ libgtk2.0-0 \
libx11-xcb-dev \
libxrender1 \ libxrender1 \
libx11-xcb-dev \
libx11-xcb1 \
libxt6 \ libxt6 \
xz-utils \ xz-utils \
--no-install-recommends \ --no-install-recommends \
@ -32,21 +33,27 @@ RUN useradd --create-home --home-dir $HOME user \
ENV LANG C.UTF-8 ENV LANG C.UTF-8
# https://www.torproject.org/projects/torbrowser.html.en # https://www.torproject.org/projects/torbrowser.html.en
ENV TOR_VERSION 7.5a9 ENV TOR_VERSION 8.0a1
ENV TOR_FINGERPRINT 0x4E2C6E8793298290 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
# download tor and check signature # download tor and check signature
RUN cd /tmp \ 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" \
&& curl -sSOL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc" \ && 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)" \
&& 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 --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 \ && 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 \ && 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 tor-browser* "$GNUPGHOME" \
&& rm -rf ~/.gnupg && chown -R user:user /usr/local/bin
# good fonts # good fonts
COPY local.conf /etc/fonts/local.conf COPY local.conf /etc/fonts/local.conf

6
tor-browser/stable/Dockerfile
View File

@ -40,7 +40,7 @@ ENV TOR_FINGERPRINT 0x4E2C6E8793298290
RUN cd /tmp \ 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" \
&& curl -sSOL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc" \ && 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 \ && for server in $(shuf -e \
ha.pool.sks-keyservers.net \ ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \ 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 --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 \ && 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 \ && 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 tor-browser* "$GNUPGHOME" \
&& rm -rf ~/.gnupg \
&& chown -R user:user /usr/local/bin && chown -R user:user /usr/local/bin
# good fonts # good fonts
COPY local.conf /etc/fonts/local.conf COPY local.conf /etc/fonts/local.conf