feat: update bitcoin v23.0, update base image. (#6)

cryptogarageinc · Apr 27, 2022 · 8fc9c2e · 8fc9c2e
1 parent 66b5e1d
commit 8fc9c2e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/create-docker-image.yml b/.github/workflows/create-docker-image.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        baseimage: ['python:3.9.10-slim-buster']
+        baseimage: ['3.10.4-slim-bullseye']
 
     steps:
     - uses: actions/checkout@v2

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.10-slim-buster
+FROM python:3.10.4-slim-bullseye
 
 # install dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -20,22 +20,31 @@ RUN python -V && node -v
 WORKDIR /tmp
 ENV GPG_KEY_SERVER hkps://keyserver.ubuntu.com
 # setup bitcoin
-ARG BITCOIN_VERSION=22.0
+ARG BITCOIN_VERSION=23.0
 ENV BITCOIN_TARBALL bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz
 ENV BITCOIN_URL_BASE https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}
-ENV BITCOIN_PGP_KEY  0CCBAAFD76A2ECE2CCD3141DE2FFD5B1D88CA97D 152812300785C96444D3334D17565732E08E5E41 0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 590B7292695AFFA5B672CBB2E13FC145CD3F4304 28F5900B1BB5D1A4B6B6D1A9ED357015286A333D 637DB1E23370F84AFF88CCE03152347D07DA627C CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 6E01EEC9656903B0542B8F1003DB6322267C373B D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 9DEAE0DC7063249FB05474681E4AED62986CD25D 9D3CC86A72F8494342EA5FD10A41BDC3F4FAFF1C 74E2DEF5D77260B98BC19438099BAD163C70FBFA 
-# 71A3B16735405025D447E8F274810B012346C9A6
+ENV BITCOIN_PGP_KEY  152812300785C96444D3334D17565732E08E5E41 0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 590B7292695AFFA5B672CBB2E13FC145CD3F4304 28F5900B1BB5D1A4B6B6D1A9ED357015286A333D 637DB1E23370F84AFF88CCE03152347D07DA627C CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 F4FC70F07310028424EFC20A8E4256593F177720 D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 287AE4CA1187C68C08B49CB2D11BD4F33F1DB499 F9A8737BF4FF5C89C903DF31DD78544CF91B1514 9DEAE0DC7063249FB05474681E4AED62986CD25D E463A93F5F3117EEDE6C7316BD02942421F4889F 9D3CC86A72F8494342EA5FD10A41BDC3F4FAFF1C 4DAF18FE948E7A965B30F9457E296D555E7F63A7 28E72909F1717FE9607754F8A7BEB2621678D37D 74E2DEF5D77260B98BC19438099BAD163C70FBFA
 RUN wget -qO ${BITCOIN_TARBALL} ${BITCOIN_URL_BASE}/${BITCOIN_TARBALL} \
-    && gpg -v --keyserver ${GPG_KEY_SERVER} --recv-keys ${BITCOIN_PGP_KEY} \
-    && gpg -v --keyserver hkps://keys.openpgp.org --recv-keys 82921A4B88FD454B7EB8CE3C796C4109063D4EAF \
     && wget -qO SHA256SUMS ${BITCOIN_URL_BASE}/SHA256SUMS \
     && wget -qO SHA256SUMS.asc ${BITCOIN_URL_BASE}/SHA256SUMS.asc \
-    && gpg --verify SHA256SUMS.asc \
+    && echo "dump RSA key" \
+    && gpg --verify SHA256SUMS.asc 2>&1 | grep "using RSA key" | tr -s ' ' | cut -d ' ' -f5 \
+    && echo "dump ECDSA key" \
+    && gpg --verify SHA256SUMS.asc 2>&1 | grep "using ECDSA key" | tr -s ' ' | cut -d ' ' -f5 \
+    && echo "dump key" \
+    && gpg --verify SHA256SUMS.asc 2>&1 | grep "using " | tr -s ' ' | cut -d ' ' -f5 \
+    && gpg -v --keyserver ${GPG_KEY_SERVER} --recv-keys ${BITCOIN_PGP_KEY} \
+    && gpg -v --keyserver hkps://keys.openpgp.org --recv-keys 82921A4B88FD454B7EB8CE3C796C4109063D4EAF \
+    && gpg -v --keyserver hkps://keys.openpgp.org --recv-keys C388F6961FB972A95678E327F62711DBDCA8AE56 \
     && sha256sum --ignore-missing --check SHA256SUMS \
     && tar -xzvf ${BITCOIN_TARBALL} --directory=/opt/ \
     && ln -sfn /opt/bitcoin-${BITCOIN_VERSION}/bin/* /usr/bin \
     && rm -f ${BITCOIN_TARBALL} SHA256SUMS.asc
 
+#20220427: ignore gpg verify (for C388F6961FB972A95678E327F62711DBDCA8AE56)
+#    && gpg --verify -v SHA256SUMS.asc \
+#    && sha256sum --ignore-missing --check SHA256SUMS \
+
 
 # setup elements
 ARG ELEMENTS_VERSION=0.21.0.2
@@ -57,7 +66,7 @@ RUN wget -qO ${ELEMENTS_TARBALL} ${ELEMENTS_URL_BASE}/${ELEMENTS_TARBALL} \
 
 
 # setup cmake
-ENV CMAKE_VERSION 3.21.5
+ENV CMAKE_VERSION 3.22.4
 ENV CMAKE_TARBALL cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
 ENV CMAKE_URL_BASE https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}
 ENV CMAKE_PGP_KEY 2D2CEF1034921684