Use less bash-fu for the gpg imports

Per Alex's suggestion, I can avoid bash fu by separating it into multiple lines

Author: ddworken

docker/Dockerfile-ca

@@ -13,19 +13,13 @@ WORKDIR /home/keybase
 # Key fingerprint from https://keybase.io/docs/server_security/our_code_signing_key
 RUN curl --remote-name https://prerelease.keybase.io/keybase_amd64.deb
 RUN curl --remote-name https://prerelease.keybase.io/keybase_amd64.deb.sig
-# GPG has no easy way of getting the ID associated with a key, so we do this :(
-# This line will error if the fingerprint of the key in the file does not match
-# Key fingerprint from https://keybase.io/docs/server_security/our_code_signing_key
-# Note that we do it this way rather than via the key servers since pulling from the
-# key servers caused a flakey build
-RUN gpg --with-colons --fingerprint $( \
-        curl -sSL https://keybase.io/docs/server_security/code_signing_key.asc | \
-        gpg --import 2>&1 | \
-        grep -v created | \
-        head -n 1 | \
-        cut -d ' ' -f 3 | \
-        cut -d ':' -f 1 \
-    ) | grep fpr | cut -d ':' -f 10 | grep 222B85B0F90BE2D24CFEB93F47484E50656D16C7
+# Import our gpg key from our website. Pulling from key servers caused a flakey build so
+# we get the key from the Keybase website instead.
+RUN curl -sSL https://keybase.io/docs/server_security/code_signing_key.asc | gpg --import
+# This line will error if the fingerprint of the key in the file does not match the
+# known fingerprint of the our PGP key
+RUN gpg --fingerprint 222B85B0F90BE2D24CFEB93F47484E50656D16C7
+# And then verify the signature now that we have the key
 RUN gpg --verify keybase_amd64.deb.sig keybase_amd64.deb
 
 # Silence the error from dpkg about failing to configure keybase since `apt-get install -f` fixes it

tests/Dockerfile-kssh

@@ -12,19 +12,13 @@ WORKDIR /home/keybase
 # Download and verify the deb
 RUN curl --remote-name https://prerelease.keybase.io/keybase_amd64.deb
 RUN curl --remote-name https://prerelease.keybase.io/keybase_amd64.deb.sig
-# GPG has no easy way of getting the ID associated with a key, so we do this :(
-# This line will error if the fingerprint of the key in the file does not match
-# Key fingerprint from https://keybase.io/docs/server_security/our_code_signing_key
-# Note that we do it this way rather than via the key servers since pulling from the
-# key servers caused a flakey build
-RUN gpg --with-colons --fingerprint $( \
-        curl -sSL https://keybase.io/docs/server_security/code_signing_key.asc | \
-        gpg --import 2>&1 | \
-        grep -v created | \
-        head -n 1 | \
-        cut -d ' ' -f 3 | \
-        cut -d ':' -f 1 \
-    ) | grep fpr | cut -d ':' -f 10 | grep 222B85B0F90BE2D24CFEB93F47484E50656D16C7
+# Import our gpg key from our website. Pulling from key servers caused a flakey build so
+# we get the key from the Keybase website instead.
+RUN curl -sSL https://keybase.io/docs/server_security/code_signing_key.asc | gpg --import
+# This line will error if the fingerprint of the key in the file does not match the
+# known fingerprint of the our PGP key
+RUN gpg --fingerprint 222B85B0F90BE2D24CFEB93F47484E50656D16C7
+# And then verify the signature now that we have the key
 RUN gpg --verify keybase_amd64.deb.sig keybase_amd64.deb
 
 # Silence the error from dpkg about failing to configure keybase since `apt-get install -f` fixes it