From 8d57ca06eab4f6a154cf6214ad9a56b2555640b4 Mon Sep 17 00:00:00 2001 From: David Dworken Date: Thu, 5 Sep 2019 19:24:28 -0400 Subject: [PATCH] Revert "Merge pull request #55 from keybase/david/docker-build-verify-pgp" This reverts commit 79a7d866fe13f2f6cb2d30c866dd47cdec0acc67, reversing changes made to a08fe3681bcddc88350a6426dc43e60824cf523a. --- docker/Dockerfile-ca | 13 ++----------- tests/Dockerfile-kssh | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/docker/Dockerfile-ca b/docker/Dockerfile-ca index 7cd1f85..dcde58a 100644 --- a/docker/Dockerfile-ca +++ b/docker/Dockerfile-ca @@ -2,24 +2,15 @@ # between this file and Dockerfile-kssh. FROM ubuntu:18.04 -# Dependencies RUN apt-get -qq update -RUN apt-get -qq install curl software-properties-common ca-certificates gnupg -y +RUN apt-get -qq install curl software-properties-common -y RUN useradd -ms /bin/bash keybase USER keybase WORKDIR /home/keybase - -# Download and verify the deb -# 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 -RUN gpg --keyserver pgp.mit.edu --recv-keys "222B85B0F90BE2D24CFEB93F47484E50656D16C7" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "222B85B0F90BE2D24CFEB93F47484E50656D16C7" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "222B85B0F90BE2D24CFEB93F47484E50656D16C7" -RUN gpg --verify keybase_amd64.deb.sig keybase_amd64.deb +USER root # Silence the error from dpkg about failing to configure keybase since `apt-get install -f` fixes it -USER root RUN dpkg -i keybase_amd64.deb || true RUN apt-get install -fy USER keybase diff --git a/tests/Dockerfile-kssh b/tests/Dockerfile-kssh index f64aca6..0a42f68 100644 --- a/tests/Dockerfile-kssh +++ b/tests/Dockerfile-kssh @@ -2,24 +2,15 @@ # between this file and Dockerfile-ca. FROM ubuntu:18.04 -# Dependencies RUN apt-get -qq update -RUN apt-get -qq install curl software-properties-common ca-certificates gnupg -y +RUN apt-get -qq install curl software-properties-common -y RUN useradd -ms /bin/bash keybase USER keybase WORKDIR /home/keybase - -# Download and verify the deb -# 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 -RUN gpg --keyserver pgp.mit.edu --recv-keys "222B85B0F90BE2D24CFEB93F47484E50656D16C7" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "222B85B0F90BE2D24CFEB93F47484E50656D16C7" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "222B85B0F90BE2D24CFEB93F47484E50656D16C7" -RUN gpg --verify keybase_amd64.deb.sig keybase_amd64.deb +USER root # Silence the error from dpkg about failing to configure keybase since `apt-get install -f` fixes it -USER root RUN dpkg -i keybase_amd64.deb || true RUN apt-get install -fy USER keybase