From 9a3a8d4a3d99f3c491f3ec89321a193823c05d83 Mon Sep 17 00:00:00 2001 From: Alistair Burrowes Date: Wed, 21 Jul 2021 18:08:59 +1000 Subject: [PATCH 1/2] Switch away from deprecated keyserver As per https://central.sonatype.org/publish/requirements/gpg/#distributing-your-public-key the sks-keyservers.net is deprecated. I could no longer build the images using them. I updated them to use keyserver.ubuntu.com --- 8.10/buster/Dockerfile | 4 ++-- 8.10/stretch/Dockerfile | 4 ++-- 9.0/buster/Dockerfile | 4 ++-- 9.0/stretch/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/8.10/buster/Dockerfile b/8.10/buster/Dockerfile index dbf52f2..a7e1b15 100644 --- a/8.10/buster/Dockerfile +++ b/8.10/buster/Dockerfile @@ -39,8 +39,8 @@ ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D RUN export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_KEY} && \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_RELEASE_KEY} && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${STACK_KEY} && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${STACK_RELEASE_KEY} && \ curl -fSL https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-x86_64.tar.gz -o stack.tar.gz && \ curl -fSL https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-x86_64.tar.gz.asc -o stack.tar.gz.asc && \ gpg --batch --trusted-key 0x575159689BEFB442 --verify stack.tar.gz.asc stack.tar.gz && \ diff --git a/8.10/stretch/Dockerfile b/8.10/stretch/Dockerfile index f7d53b9..4ef84f5 100644 --- a/8.10/stretch/Dockerfile +++ b/8.10/stretch/Dockerfile @@ -39,8 +39,8 @@ ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D RUN export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_KEY} && \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_RELEASE_KEY} && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${STACK_KEY} && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${STACK_RELEASE_KEY} && \ curl -fSL https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-x86_64.tar.gz -o stack.tar.gz && \ curl -fSL https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-x86_64.tar.gz.asc -o stack.tar.gz.asc && \ gpg --batch --trusted-key 0x575159689BEFB442 --verify stack.tar.gz.asc stack.tar.gz && \ diff --git a/9.0/buster/Dockerfile b/9.0/buster/Dockerfile index fdf11f4..24aa8c9 100644 --- a/9.0/buster/Dockerfile +++ b/9.0/buster/Dockerfile @@ -39,8 +39,8 @@ ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D RUN export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_KEY} && \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_RELEASE_KEY} && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${STACK_KEY} && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${STACK_RELEASE_KEY} && \ curl -fSL https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-x86_64.tar.gz -o stack.tar.gz && \ curl -fSL https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-x86_64.tar.gz.asc -o stack.tar.gz.asc && \ gpg --batch --trusted-key 0x575159689BEFB442 --verify stack.tar.gz.asc stack.tar.gz && \ diff --git a/9.0/stretch/Dockerfile b/9.0/stretch/Dockerfile index 3282c38..2f8bf64 100644 --- a/9.0/stretch/Dockerfile +++ b/9.0/stretch/Dockerfile @@ -39,8 +39,8 @@ ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D RUN export GNUPGHOME="$(mktemp -d)" && \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_KEY} && \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_RELEASE_KEY} && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${STACK_KEY} && \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${STACK_RELEASE_KEY} && \ curl -fSL https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-x86_64.tar.gz -o stack.tar.gz && \ curl -fSL https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-x86_64.tar.gz.asc -o stack.tar.gz.asc && \ gpg --batch --trusted-key 0x575159689BEFB442 --verify stack.tar.gz.asc stack.tar.gz && \ From 3dbe06972f06e191a493b43e8c000c779904af34 Mon Sep 17 00:00:00 2001 From: Alistair Burrowes Date: Wed, 21 Jul 2021 18:17:40 +1000 Subject: [PATCH 2/2] Bump stack to 2.7.3 --- 8.10/buster/Dockerfile | 2 +- 8.10/stretch/Dockerfile | 2 +- 9.0/buster/Dockerfile | 2 +- 9.0/stretch/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.10/buster/Dockerfile b/8.10/buster/Dockerfile index a7e1b15..ddf001a 100644 --- a/8.10/buster/Dockerfile +++ b/8.10/buster/Dockerfile @@ -34,7 +34,7 @@ RUN export GNUPGHOME="$(mktemp -d)" && \ ghc-${GHC} && \ rm -rf "$GNUPGHOME" /var/lib/apt/lists/* -ARG STACK=2.7.1 +ARG STACK=2.7.3 ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D diff --git a/8.10/stretch/Dockerfile b/8.10/stretch/Dockerfile index 4ef84f5..37a7d7b 100644 --- a/8.10/stretch/Dockerfile +++ b/8.10/stretch/Dockerfile @@ -34,7 +34,7 @@ RUN export GNUPGHOME="$(mktemp -d)" && \ ghc-${GHC} && \ rm -rf "$GNUPGHOME" /var/lib/apt/lists/* -ARG STACK=2.7.1 +ARG STACK=2.7.3 ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D diff --git a/9.0/buster/Dockerfile b/9.0/buster/Dockerfile index 24aa8c9..958c808 100644 --- a/9.0/buster/Dockerfile +++ b/9.0/buster/Dockerfile @@ -34,7 +34,7 @@ RUN export GNUPGHOME="$(mktemp -d)" && \ ghc-${GHC} && \ rm -rf "$GNUPGHOME" /var/lib/apt/lists/* -ARG STACK=2.7.1 +ARG STACK=2.7.3 ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D diff --git a/9.0/stretch/Dockerfile b/9.0/stretch/Dockerfile index 2f8bf64..892fc72 100644 --- a/9.0/stretch/Dockerfile +++ b/9.0/stretch/Dockerfile @@ -34,7 +34,7 @@ RUN export GNUPGHOME="$(mktemp -d)" && \ ghc-${GHC} && \ rm -rf "$GNUPGHOME" /var/lib/apt/lists/* -ARG STACK=2.7.1 +ARG STACK=2.7.3 ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D