From 00fe42ab059f8f92a02ad3c6d73a09558eb0aa63 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 26 Feb 2016 17:02:22 -0800 Subject: [PATCH] Fix "gpg" usage to stop relying on deprecated and insecure behavior --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f88011..c0d51a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,6 @@ RUN useradd --create-home --home-dir $HOME user \ ENV LANG C.UTF-8 -# gpg: key DDBEF0E1: public key "The Irssi project " imported -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 - ENV IRSSI_VERSION 0.8.17 RUN buildDeps=' \ @@ -40,10 +37,14 @@ RUN buildDeps=' \ && rm -rf /var/lib/apt/lists/* \ && curl -fsSL "https://github.com/irssi-import/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.bz2" -o /tmp/irssi.tar.bz2 \ && curl -fsSL "https://github.com/irssi-import/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.bz2.sig" -o /tmp/irssi.tar.bz2.sig \ - && gpg --verify /tmp/irssi.tar.bz2.sig \ + && export GNUPGHOME="$(mktemp -d)" \ +# gpg: key DDBEF0E1: public key "The Irssi project " imported + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 \ + && gpg --batch --verify /tmp/irssi.tar.bz2.sig /tmp/irssi.tar.bz2 \ + && rm -r "$GNUPGHOME" /tmp/irssi.tar.bz2.sig \ && mkdir -p /usr/src/irssi \ && tar -xjf /tmp/irssi.tar.bz2 -C /usr/src/irssi --strip-components 1 \ - && rm /tmp/irssi.tar.bz2* \ + && rm /tmp/irssi.tar.bz2 \ && cd /usr/src/irssi \ && ./configure \ --enable-true-color \