From fc86f282277f321e0b50e233a36a27bf72007343 Mon Sep 17 00:00:00 2001 From: kenshin-samourai Date: Fri, 27 Dec 2019 16:27:26 +0100 Subject: [PATCH 1/2] use port 80 of pgp keyservers --- docker/my-dojo/bitcoin/Dockerfile | 3 ++- docker/my-dojo/tor/Dockerfile | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docker/my-dojo/bitcoin/Dockerfile b/docker/my-dojo/bitcoin/Dockerfile index db886392..2a2feea9 100644 --- a/docker/my-dojo/bitcoin/Dockerfile +++ b/docker/my-dojo/bitcoin/Dockerfile @@ -9,6 +9,7 @@ ENV BITCOIN_VERSION 0.19.0.1 ENV BITCOIN_URL https://bitcoincore.org/bin/bitcoin-core-0.19.0.1/bitcoin-0.19.0.1-x86_64-linux-gnu.tar.gz ENV BITCOIN_SHA256 732cc96ae2e5e25603edf76b8c8af976fe518dd925f7e674710c6c8ee5189204 ENV BITCOIN_ASC_URL https://bitcoincore.org/bin/bitcoin-core-0.19.0.1/SHA256SUMS.asc +ENV BITCOIN_PGP_KS_URI hkp://keyserver.ubuntu.com:80 ENV BITCOIN_PGP_KEY 01EA5486DE18A882D4C2684590C8019E36C2E964 RUN set -ex && \ @@ -21,7 +22,7 @@ RUN set -ex && \ cd /tmp && \ wget -qO bitcoin.tar.gz "$BITCOIN_URL" && \ echo "$BITCOIN_SHA256 bitcoin.tar.gz" | sha256sum -c - && \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$BITCOIN_PGP_KEY" && \ + gpg --batch --keyserver "$BITCOIN_PGP_KS_URI" --recv-keys "$BITCOIN_PGP_KEY" && \ wget -qO bitcoin.asc "$BITCOIN_ASC_URL" && \ gpg --batch --verify bitcoin.asc && \ tar -xzvf bitcoin.tar.gz -C /usr/local --strip-components=1 --exclude=*-qt && \ diff --git a/docker/my-dojo/tor/Dockerfile b/docker/my-dojo/tor/Dockerfile index 6e96b2ac..b7a0ffea 100644 --- a/docker/my-dojo/tor/Dockerfile +++ b/docker/my-dojo/tor/Dockerfile @@ -3,6 +3,7 @@ FROM debian:stretch ENV TOR_HOME /var/lib/tor ENV TOR_URL https://archive.torproject.org/tor-package-archive ENV TOR_VERSION 0.3.5.8 +ENV TOR_GPG_KS_URI hkp://ipv4.pool.sks-keyservers.net:80 ENV TOR_GPG_KEY1 0xEB5A896A28988BF5 ENV TOR_GPG_KEY2 0xC218525819F78451 ENV TOR_GPG_KEY3 0x21194EBB165733EA @@ -24,10 +25,10 @@ RUN set -ex && \ cd /usr/local/src && \ wget -qO "tor-$TOR_VERSION.tar.gz" "$TOR_URL/tor-$TOR_VERSION.tar.gz" && \ wget -qO "tor-$TOR_VERSION.tar.gz.asc" "$TOR_URL/tor-$TOR_VERSION.tar.gz.asc" && \ - gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$TOR_GPG_KEY1" && \ - gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$TOR_GPG_KEY2" && \ - gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$TOR_GPG_KEY3" && \ - gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$TOR_GPG_KEY4" && \ + gpg --keyserver "$TOR_GPG_KS_URI" --recv-keys "$TOR_GPG_KEY1" && \ + gpg --keyserver "$TOR_GPG_KS_URI" --recv-keys "$TOR_GPG_KEY2" && \ + gpg --keyserver "$TOR_GPG_KS_URI" --recv-keys "$TOR_GPG_KEY3" && \ + gpg --keyserver "$TOR_GPG_KS_URI" --recv-keys "$TOR_GPG_KEY4" && \ gpg --verify "tor-$TOR_VERSION.tar.gz.asc" && \ tar -xzvf "tor-$TOR_VERSION.tar.gz" -C /usr/local/src && \ cd "/usr/local/src/tor-$TOR_VERSION" && \ From 754a8e42e8964099c75a9cf7d3aa4669eb113fd4 Mon Sep 17 00:00:00 2001 From: kenshin-samourai Date: Fri, 27 Dec 2019 16:27:48 +0100 Subject: [PATCH 2/2] bump version of bitcoind image --- docker/my-dojo/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/my-dojo/.env b/docker/my-dojo/.env index b36210ff..a3018081 100644 --- a/docker/my-dojo/.env +++ b/docker/my-dojo/.env @@ -12,7 +12,7 @@ COMPOSE_CONVERT_WINDOWS_PATHS=1 DOJO_VERSION_TAG=1.4.0 DOJO_DB_VERSION_TAG=1.1.0 -DOJO_BITCOIND_VERSION_TAG=1.3.0 +DOJO_BITCOIND_VERSION_TAG=1.4.0 DOJO_NODEJS_VERSION_TAG=1.4.0 DOJO_NGINX_VERSION_TAG=1.4.0 DOJO_TOR_VERSION_TAG=1.3.0