Skip to content

Commit

Permalink
GEODE-9403: use a better keyserver in Dockerfile (apache#6648)
Browse files Browse the repository at this point in the history
* sks-keyservers is going away, so use a better one
* also patch this change into support branches upon their next release
  • Loading branch information
onichols-pivotal authored Jul 1, 2021
1 parent 6f2cad3 commit b037f2f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions dev-tools/release/promote_rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ set +x
sed -e "s/^ENV GEODE_GPG.*/ENV GEODE_GPG ${SIGNING_KEY}/" \
-e "s/^ENV GEODE_VERSION.*/ENV GEODE_VERSION ${VERSION}/" \
-e "s/^ENV GEODE_SHA256.*/ENV GEODE_SHA256 ${GEODE_SHA}/" \
-e "s/ha.pool.sks-keyservers.net/keyserver.ubuntu.com/" \
-i.bak Dockerfile
rm Dockerfile.bak
set -x
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ RUN set -eux; \
[ -s "apache-geode-$GEODE_VERSION.tgz.asc" ]; \
echo "$GEODE_SHA256 *apache-geode-$GEODE_VERSION.tgz" | sha256sum -c -; \
export GNUPGHOME="$(mktemp -d)"; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GEODE_GPG"; \
gpg --keyserver keyserver.ubuntu.com --recv-keys "$GEODE_GPG"; \
gpg --batch --verify "apache-geode-$GEODE_VERSION.tgz.asc" "apache-geode-$GEODE_VERSION.tgz"; \
rm -rf "$GNUPGHOME"; \
mkdir /geode; \
Expand Down

0 comments on commit b037f2f

Please sign in to comment.