fix fingerprints

Signed-off-by: Jess Frazelle <me@jessfraz.com>
bketelsen · Sep 20, 2016 · 23b8c74 · 23b8c74
1 parent 14dfd14
commit 23b8c74
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/tor-browser/alpha/Dockerfile b/tor-browser/alpha/Dockerfile
@@ -11,6 +11,7 @@ MAINTAINER Jessie Frazelle <jess@linux.com>
 RUN apt-get update && apt-get install -y \
 	ca-certificates \
 	curl \
+	gnupg \
 	libasound2 \
 	libdbus-glib-1-2 \
 	libgtk2.0-0 \
@@ -26,7 +27,7 @@ RUN useradd --create-home --home-dir $HOME user \
 
 ENV LANG C.UTF-8
 
-ENV TOR_VERSION 6.5a2
+ENV TOR_VERSION 6.5a3
 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
 
 # download tor and check signature
@@ -35,7 +36,7 @@ RUN cd /tmp \
 	&& curl -sSOL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc" \
 	&& mkdir ~/.gnupg \
 	&& gpg --keyserver "hkp://pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} \
-	&& gpg --fingerprint ${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 \
 	&& tar -vxJ --strip-components 1 -C /usr/local/bin -f tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz \
 	&& rm -rf tor-browser* \

diff --git a/tor-browser/hardened/Dockerfile b/tor-browser/hardened/Dockerfile
@@ -11,6 +11,7 @@ MAINTAINER Christian Koep <christian.koep@fom-net.de>
 RUN apt-get update && apt-get install -y \
 	ca-certificates \
 	curl \
+	gnupg \
 	libasound2 \
 	libdbus-glib-1-2 \
 	libgtk2.0-0 \
@@ -26,7 +27,7 @@ RUN useradd --create-home --home-dir $HOME user \
 
 ENV LANG C.UTF-8
 
-ENV TOR_VERSION 6.5a2-hardened
+ENV TOR_VERSION 6.5a3-hardened
 ENV TOR_FINGERPRINT 0x4E2C6E8793298290
 
 # download tor and check signature
@@ -35,7 +36,7 @@ RUN cd /tmp \
 	&& curl -sSOL "https://dist.torproject.org/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_ALL.tar.xz.asc" \
 	&& mkdir ~/.gnupg \
 	&& gpg --keyserver "hkp://pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} \
-	&& gpg --fingerprint ${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}_ALL.tar.xz.asc \
 	&& tar -vxJ --strip-components 1 -C /usr/local/bin -f tor-browser-linux64-${TOR_VERSION}_ALL.tar.xz \
 	&& rm -rf tor-browser* \

diff --git a/tor-browser/stable/Dockerfile b/tor-browser/stable/Dockerfile
@@ -11,6 +11,7 @@ MAINTAINER Jessie Frazelle <jess@linux.com>
 RUN apt-get update && apt-get install -y \
 	ca-certificates \
 	curl \
+	gnupg \
 	libasound2 \
 	libdbus-glib-1-2 \
 	libgtk2.0-0 \
@@ -35,7 +36,7 @@ RUN cd /tmp \
 	&& curl -sSOL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc" \
 	&& mkdir ~/.gnupg \
 	&& gpg --keyserver "hkp://pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} \
-	&& gpg --fingerprint ${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 \
 	&& tar -vxJ --strip-components 1 -C /usr/local/bin -f tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz \
 	&& rm -rf tor-browser* \

diff --git a/tor-messenger/Dockerfile b/tor-messenger/Dockerfile
@@ -16,6 +16,7 @@ ENV TOR_FINGERPRINT 0xB01C8B006DA77FAA
 RUN apt-get update && apt-get -y install \
 	ca-certificates \
 	curl \
+	gnupg \
 	gxmessage \
 	libasound2 \
 	libdbus-glib-1-2 \
@@ -34,7 +35,7 @@ RUN cd /tmp && \
 	curl -sSOL https://dist.torproject.org/tormessenger/${TOR_VERSION}/sha256sums.txt.asc && \
 	mkdir ~/.gnupg && \
 	gpg --keyserver x-hkp://pgp.mit.edu --recv-keys ${TOR_FINGERPRINT} || \
-	gpg --fingerprint ${TOR_FINGERPRINT} | grep "Key fingerprint = 3A0B 3D84 3708 9613 6B84	5E82 6887 935A B297 B391" && \
+	gpg --fingerprint --keyid-format LONG ${TOR_FINGERPRINT} | grep "Key fingerprint = 3A0B 3D84 3708 9613 6B84	5E82 6887 935A B297 B391" && \
 	gpg --verify sha256sums.txt.asc && \
 	grep $(sha256sum tor-messenger-linux64-${TOR_VERSION}_en-US.tar.xz) sha256sums.txt && \
 	tar xfv tor-messenger-linux64-${TOR_VERSION}_en-US.tar.xz -C /usr/local/bin && \